From 1a29857705b9c4c79b740045a0cef06e45674ea2 Mon Sep 17 00:00:00 2001
From: ivegotasthma <ivegotasthma@protonmail.com>
Date: Mon, 12 Aug 2019 06:23:18 +0200
Subject: [PATCH 001/755] pythonPackages.coreschema: init at 0.0.4

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

diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
new file mode 100644
index 000000000000..ba836f78a6e9
--- /dev/null
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -0,0 +1,34 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  jinja2,
+  pytest,
+}:
+
+buildPythonPackage rec {
+  pname = "coreschema";
+  version = "0.0.4";
+
+  src = fetchFromGitHub {
+    repo = "python-coreschema";
+    owner = "core-api";
+    rev = version;
+    sha256 = "027pc753mkgbb3r1v1x7dsdaarq93drx0f79ppvw9pfkcjcq6wb1";
+  };
+
+  propagatedBuildInputs = [ jinja2 ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    mv coreschema coreschema.hidden
+    pytest tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python client library for Core Schema";
+    homepage = https://github.com/ivegotasthma/python-coreschema;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ivegotasthma ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b89401cb958..23d64541032a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1800,6 +1800,8 @@ in {
 
   cookies = callPackage ../development/python-modules/cookies { };
 
+  coreschema = callPackage ../development/python-modules/coreschema { };
+
   coveralls = callPackage ../development/python-modules/coveralls { };
 
   coverage = callPackage ../development/python-modules/coverage { };

From 4f25a125a7aeee62f0325ade460341a490832244 Mon Sep 17 00:00:00 2001
From: ivegotasthma <ivegotasthma@protonmail.com>
Date: Mon, 12 Aug 2019 06:23:51 +0200
Subject: [PATCH 002/755] pythonPackages.coreapi: init at 2.3.3

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

diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
new file mode 100644
index 000000000000..0bbaa0b1b51d
--- /dev/null
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  django,
+  coreschema,
+  itypes,
+  uritemplate,
+  requests,
+  pytest,
+}:
+
+buildPythonPackage rec {
+  pname = "coreapi";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    repo = "python-client";
+    owner = "core-api";
+    rev = version;
+    sha256 = "1c6chm3q3hyn8fmjv23qgc79ai1kr3xvrrkp4clbqkssn10k7mcw";
+  };
+
+  propagatedBuildInputs = [
+    django
+    coreschema
+    itypes
+    uritemplate
+    requests
+  ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    mv coreapi coreapi.hidden
+    pytest tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python client library for Core API";
+    homepage = https://github.com/core-api/python-client;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ivegotasthma ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23d64541032a..bd1f503ddea2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1800,6 +1800,8 @@ in {
 
   cookies = callPackage ../development/python-modules/cookies { };
 
+  coreapi = callPackage ../development/python-modules/coreapi { };
+
   coreschema = callPackage ../development/python-modules/coreschema { };
 
   coveralls = callPackage ../development/python-modules/coveralls { };

From 413567990758333c3b6d90e455af629aba3593b4 Mon Sep 17 00:00:00 2001
From: ivegotasthma <ivegotasthma@protonmail.com>
Date: Mon, 12 Aug 2019 06:24:12 +0200
Subject: [PATCH 003/755] pythonPackages.itypes: init at 1.1.0

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

diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
new file mode 100644
index 000000000000..1386ba39a268
--- /dev/null
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytest,
+}:
+
+buildPythonPackage rec {
+  pname = "itypes";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "tomchristie";
+    rev = version;
+    sha256 = "0zkhn16wpslkxkq77dqw5rxa28nrchcb6nd3vgnxv91p4skyfm62";
+  };
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    mv itypes.py itypes.py.hidden
+    pytest tests.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple immutable types for python";
+    homepage = https://github.com/tomchristie/itypes;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ivegotasthma ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd1f503ddea2..c6f073711c77 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2404,6 +2404,8 @@ in {
 
   itsdangerous = callPackage ../development/python-modules/itsdangerous { };
 
+  itypes = callPackage ../development/python-modules/itypes { };
+
   iniparse = callPackage ../development/python-modules/iniparse { };
 
   i3-py = callPackage ../development/python-modules/i3-py { };

From cecfde44e6f68395abb2fef79cfb84d153f0296e Mon Sep 17 00:00:00 2001
From: ivegotasthma <ivegotasthma@protonmail.com>
Date: Mon, 12 Aug 2019 21:53:25 +0200
Subject: [PATCH 004/755] pythonPackages.drf-yasg: init at 1.16.1

---
 .../python-modules/coreapi/default.nix        |  4 +-
 .../python-modules/coreschema/default.nix     |  4 +-
 .../python-modules/drf-yasg/default.nix       | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/drf-yasg/default.nix

diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index 0bbaa0b1b51d..216d1ee69850 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -31,8 +31,8 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   checkPhase = ''
-    mv coreapi coreapi.hidden
-    pytest tests
+    cd ./tests
+    pytest
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
index ba836f78a6e9..949fa31df958 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -21,8 +21,8 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   checkPhase = ''
-    mv coreschema coreschema.hidden
-    pytest tests
+    cd ./tests
+    pytest
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
new file mode 100644
index 000000000000..707b1e5bc6e2
--- /dev/null
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  inflection,
+  ruamel_yaml,
+  setuptools_scm,
+  six,
+  coreapi,
+  djangorestframework,
+}:
+
+buildPythonPackage rec {
+  pname = "drf-yasg";
+  version = "1.16.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ri5h5xsacm99c6gvb4ldwisbqgiv2vq8qbn7vrh6vplzlpyvzb8";
+  };
+
+  nativeBuildInputs = [
+    setuptools_scm
+  ];
+
+  propagatedBuildInputs = [
+    six
+    inflection
+    ruamel_yaml
+    coreapi
+    djangorestframework
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Generation of Swagger/OpenAPI schemas for Django REST Framework";
+    homepage = https://github.com/axnsan12/drf-yasg;
+    maintainers = with maintainers; [ ivegotasthma ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6f073711c77..d3ee05a8b255 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2168,6 +2168,8 @@ in {
 
   urllib3 = callPackage ../development/python-modules/urllib3 {};
 
+  drf-yasg = callPackage ../development/python-modules/drf-yasg { };
+
   dropbox = callPackage ../development/python-modules/dropbox {};
 
   drms = callPackage ../development/python-modules/drms { };

From af665d822a166ae62547c1c310207f11acaded17 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 18 Sep 2019 22:34:41 +0000
Subject: [PATCH 005/755] add config.environment.ld-linux

Add option to install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries.
It might be useful to run games or executables distributed inside jar files as discussed
https://discourse.nixos.org/t/runtime-alternative-to-patchelf-set-interpreter/3539
https://discourse.nixos.org/t/running-binaries-without-fhs-and-patchelf/1828

It is the third concession to FHS after `/bin/sh` and `/usr/bin/env` but it is disabled by default unlike those two
---
 .../system/activation/activation-script.nix   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index ddfd1af4a319..9141c8222b73 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -162,6 +162,16 @@ in
         <literal>/usr/bin/env</literal>.
       '';
     };
+
+    environment.ld-linux = mkOption {
+      default = false;
+      type = types.bool;
+      visible = false;
+      description = ''
+        Install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries.
+        It might be useful to run games or executables distributed inside jar files.
+      '';
+    };
   };
 
 
@@ -198,6 +208,27 @@ in
         rmdir --ignore-fail-on-non-empty /usr/bin /usr
       '';
 
+    system.activationScripts.ld-linux =
+      concatStrings (
+        mapAttrsToList
+          (target: source:
+            if config.environment.ld-linux then ''
+              mkdir -m 0755 -p $(dirname ${target})
+              ln -sfn ${escapeShellArg source} ${target}.tmp
+              mv -f ${target}.tmp ${target} # atomically replace
+            '' else ''
+              rm -f ${target}
+              rmdir --ignore-fail-on-non-empty $(dirname ${target})
+            '')
+          {
+            "i686-linux"   ."/lib/ld-linux.so.2"          = "${pkgs.glibc.out}/lib/ld-linux.so.2";
+            "x86_64-linux" ."/lib/ld-linux.so.2"          = "${pkgs.pkgsi686Linux.glibc.out}/lib/ld-linux.so.2";
+            "x86_64-linux" ."/lib64/ld-linux-x86-64.so.2" = "${pkgs.glibc.out}/lib64/ld-linux-x86-64.so.2";
+            "aarch64-linux"."/lib/ld-linux-aarch64.so.1"  = "${pkgs.glibc.out}/lib/ld-linux-aarch64.so.1";
+            "armv7l-linux" ."/lib/ld-linux-armhf.so.3"    = "${pkgs.glibc.out}/lib/ld-linux-armhf.so.3";
+          }.${pkgs.stdenv.system} or {}
+      );
+
     system.activationScripts.specialfs =
       ''
         specialMount() {

From 45db499d2de2235388212a911b8344b58ddfda36 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 19 Sep 2019 00:32:35 +0000
Subject: [PATCH 006/755] rmdir: avoid failing when directory did not exist

I bet nobody has `environment.usrbinenv = null`, it would fail on the second activation trying to `rmdir` inexisting `/usr/bin`
---
 nixos/modules/system/activation/activation-script.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 9141c8222b73..495d77dfd497 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -205,7 +205,7 @@ in
       ''
       else ''
         rm -f /usr/bin/env
-        rmdir --ignore-fail-on-non-empty /usr/bin /usr
+        rmdir -p /usr/bin || true
       '';
 
     system.activationScripts.ld-linux =
@@ -218,7 +218,7 @@ in
               mv -f ${target}.tmp ${target} # atomically replace
             '' else ''
               rm -f ${target}
-              rmdir --ignore-fail-on-non-empty $(dirname ${target})
+              rmdir $(dirname ${target}) || true
             '')
           {
             "i686-linux"   ."/lib/ld-linux.so.2"          = "${pkgs.glibc.out}/lib/ld-linux.so.2";

From 0f8dc3cc2e7e74c85ed9919750b2cec319041e25 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 26 Oct 2019 04:20:00 -0500
Subject: [PATCH 007/755] pypy: fix build on darwin

---
 pkgs/development/interpreters/python/default.nix       |  8 ++++++--
 pkgs/development/interpreters/python/pypy/default.nix  | 10 ++++++++--
 .../interpreters/python/pypy/tk_tcl_paths.patch        |  9 ++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index caf2e13bdf62..4811c8ec48e8 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -158,9 +158,11 @@ in {
     };
     sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
     pythonVersion = "2.7";
-    db = db.override { dbmSupport = true; };
+    db = db.override { dbmSupport = !stdenv.isDarwin; };
     python = python27;
     inherit passthruFun;
+    inherit (darwin) libunwind;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pypy36 = callPackage ./pypy {
@@ -172,9 +174,11 @@ in {
     };
     sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
     pythonVersion = "3.6";
-    db = db.override { dbmSupport = true; };
+    db = db.override { dbmSupport = !stdenv.isDarwin; };
     python = python27;
     inherit passthruFun;
+    inherit (darwin) libunwind;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pypy27_prebuilt = callPackage ./pypy/prebuilt.nix {
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index b220bfa0f934..0c4f3eda7b1e 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, substituteAll, fetchurl
-, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
+, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security
 , sqlite, openssl_1_0_2, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
 , self, gdbm, db, lzma
 , python-setup-hook
@@ -47,6 +47,8 @@ in with passthru; stdenv.mkDerivation rec {
     stdenv.cc.libc
   ] ++ optionals zlibSupport [
     zlib
+  ] ++ optionals stdenv.isDarwin [
+    libunwind Security
   ];
 
   hardeningDisable = optional stdenv.isi686 "pic";
@@ -127,13 +129,17 @@ in with passthru; stdenv.mkDerivation rec {
     mkdir -p $out/{bin,include,lib,${executable}-c}
 
     cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c
-    cp lib${executable}-c.so $out/lib/
+    cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
     ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
 
     # other packages expect to find stuff according to libPrefix
     ln -s $out/${executable}/include $out/include/${libPrefix}
     ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
 
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable}
+    ''}
+
     # verify cffi modules
     $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"}
 
diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
index 92bbfc557b35..0b78caf7e075 100644
--- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
+++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
@@ -1,6 +1,13 @@
 --- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py	2017-10-03 11:49:20.000000000 +0100
 +++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py	2017-11-21 13:20:51.398607530 +0000
-@@ -24,11 +24,11 @@
+@@ -17,18 +17,14 @@
+     incdirs = []
+     linklibs = ['tcl85', 'tk85']
+     libdirs = []
+-elif sys.platform == 'darwin':
+-    incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
+-    linklibs = ['tcl', 'tk']
+-    libdirs = []
  else:
      # On some Linux distributions, the tcl and tk libraries are
      # stored in /usr/include, so we must check this case also

From bfcbe61076d951007f0510b7a57f66bc8ca1c1e9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 24 Nov 2019 04:03:23 +0000
Subject: [PATCH 008/755] graalvm8-ee: 19.2.1 -> 19.3.0, graalvm11-ee: init at
 19.3.0

---
 .../compilers/graalvm/enterprise-edition.nix  | 268 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   4 +-
 2 files changed, 154 insertions(+), 118 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index e180455cb7cd..dacf4a350078 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -1,133 +1,167 @@
-{ stdenv, requireFile, perl, unzip, glibc, zlib, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
+{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
 
 let
-  graalvm8-ee = stdenv.mkDerivation rec {
-    pname = "graalvm8-ee";
-    version = "19.2.0";
-    srcs = [
-      (requireFile {
-         name   = "graalvm-ee-linux-amd64-${version}.tar.gz";
-         sha256 = "1j56lyids48zyjhxk8xl4niy8hk6qzi1aj7c55yfh62id8v6cpbw";
-         url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-      })
-      (requireFile {
-         name   = "native-image-installable-svm-svmee-linux-amd64-${version}.jar";
-         sha256 = "07c25l27msxccqrbz4bknz0sxsl0z2k8990cdfkbrgxvhxspfnnm";
-         url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-      })
-      (requireFile {
-         name   = "python-installable-svm-svmee-linux-amd64-${version}.jar";
-         sha256 = "1c7kpz56w9p418li97ymixdwywscr85vhn7jkzxq71bj7ia7pxwz";
-         url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-      })
-      (requireFile {
-         name   = "ruby-installable-svm-svmee-linux-amd64-${version}.jar";
-         sha256 = "13jfm5qpxqxz7f5n9yyvqrv1vwigifrjwk3hssp23maski2ssys1";
-         url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-      })
-    ];
-    nativeBuildInputs = [ unzip perl ];
-    unpackPhase = ''
-      unpack_jar() {
-        jar=$1
-        unzip $jar -d $out
-        perl -ne 'use File::Path qw(make_path);
-                  use File::Basename qw(dirname);
-                  if (/^(.+) = (.+)$/) {
-                    make_path dirname("$ENV{out}/$1");
-                    system "ln -s $2 $ENV{out}/$1";
-                  }' $out/META-INF/symlinks
-        perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) {
-                    my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4  eq 'x' ? 0100 : 0) +
-                               ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7  eq 'x' ? 0010 : 0) +
-                               ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0);
-                    chmod $mode, "$ENV{out}/$1";
-                  }' $out/META-INF/permissions
-        rm -rf $out/META-INF
-      }
+  common = javaVersion:
+    let
+      graalvmXXX-ee = stdenv.mkDerivation rec {
+        pname = "graalvm${javaVersion}-ee";
+        version = "19.3.0";
+        srcs = [
+          (requireFile {
+             name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
+             sha256 = {  "8" = "dae766424457faea3bd2d7179477bab8dc073d92755ad09c51eee55ce5cb8b78";
+                        "11" = "aced0251642e942081aa386a05656bab84984999ced296b4e001ae982ac3842d";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "92fc421c8a07c7794179c96489ddf29d755d0a81ead2056fbf47fa137dbefc69";
+                        "11" = "fe6363ecfe919d3575607276ac6541a4f0d29cd740424b3ea7fadd26c5915106";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "2668c44a6939393983fd941fc1c5573f49a349fc0cf919f6cd0ae98b7e8fac56";
+                        "11" = "f148e1c2b78614b77ffc8c4292f62f21377e67f7359b8505fe6331d41e5a1a75";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "e5f5938b9f55bde3f8b4e0f48f52cbb79a8668b53bbf96ab89b1da8d85bdfa90";
+                        "11" = "2481b6e2644d302c190a898e58a21cda1aa32e473d12775217a6dd4d919413ea";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+        ];
+        nativeBuildInputs = [ unzip perl ];
+        unpackPhase = ''
+          unpack_jar() {
+            jar=$1
+            unzip $jar -d $out
+            perl -ne 'use File::Path qw(make_path);
+                      use File::Basename qw(dirname);
+                      if (/^(.+) = (.+)$/) {
+                        make_path dirname("$ENV{out}/$1");
+                        system "ln -s $2 $ENV{out}/$1";
+                      }' $out/META-INF/symlinks
+            perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) {
+                        my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4  eq 'x' ? 0100 : 0) +
+                                   ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7  eq 'x' ? 0010 : 0) +
+                                   ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0);
+                        chmod $mode, "$ENV{out}/$1";
+                      }' $out/META-INF/permissions
+            rm -rf $out/META-INF
+          }
 
-      mkdir -p $out
-      arr=($srcs)
-      tar xf ''${arr[0]} -C $out --strip-components=1
-      unpack_jar ''${arr[1]}
-      unpack_jar ''${arr[2]}
-      unpack_jar ''${arr[3]}
-    '';
+          mkdir -p $out
+          arr=($srcs)
+          tar xf ''${arr[0]} -C $out --strip-components=1
+          unpack_jar ''${arr[1]}
+          unpack_jar ''${arr[2]}
+          unpack_jar ''${arr[3]}
+        '';
 
-    installPhase = ''
-      # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
-      substituteInPlace $out/jre/lib/security/java.security \
-        --replace file:/dev/random    file:/dev/./urandom \
-        --replace NativePRNGBlocking  SHA1PRNG
+        installPhase = {
+          "8" = ''
+            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
+            substituteInPlace $out/jre/lib/security/java.security \
+              --replace file:/dev/random    file:/dev/./urandom \
+              --replace NativePRNGBlocking  SHA1PRNG
 
-      # provide libraries needed for static compilation
-      for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
-        ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f)
-      done
-    '';
+            # provide libraries needed for static compilation
+            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
+              ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f)
+            done
 
-    dontStrip = true;
+            # allow using external truffle-api.jar and languages not included in the distrubution
+            rm $out/jre/lib/jvmci/parentClassLoader.classpath
+          '';
+          "11" = ''
+            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
+            substituteInPlace $out/conf/security/java.security \
+              --replace file:/dev/random    file:/dev/./urandom \
+              --replace NativePRNGBlocking  SHA1PRNG
 
-    preFixup = ''
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-      EOF
-    '';
+            # provide libraries needed for static compilation
+            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
+              ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f)
+            done
+           '';
+        }.${javaVersion};
 
-    postFixup = ''
-      rpath="$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:${
-        stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
-                                             glib zlib alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
+        dontStrip = true;
 
-      for f in $(find $out -type f -perm -0100); do
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
-        patchelf --set-rpath   "$rpath"                                    "$f" || true
-      done
+        # copy-paste openjdk's preFixup
+        preFixup = ''
+          # Set JAVA_HOME automatically.
+          mkdir -p $out/nix-support
+          cat <<EOF > $out/nix-support/setup-hook
+            if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
+          EOF
+        '';
 
-      for f in $(find $out -type f -perm -0100); do
-        if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
-      done
-    '';
+        postFixup = ''
+          rpath="${ {  "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64";
+                      "11" = "$out/lib/jli:$out/lib/server:$out/lib";
+                    }.${javaVersion}
+                 }:${
+            stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
+                                                 glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
 
-    propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables
-    
-    doInstallCheck = true;
-    installCheckPhase = ''
-      echo ${stdenv.lib.escapeShellArg ''
-               public class HelloWorld {
-                 public static void main(String[] args) {
-                   System.out.println("Hello World");
-                 }
-               }
-             ''} > HelloWorld.java
-      $out/bin/javac HelloWorld.java
+          for f in $(find $out -type f -perm -0100); do
+            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
+            patchelf --set-rpath   "$rpath"                                    "$f" || true
+          done
 
-      # run on JVM with Graal Compiler
-      $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
-      $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
+          for f in $(find $out -type f -perm -0100); do
+            if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
+          done
+        '';
 
-      # Ahead-Of-Time compilation
-      $out/bin/native-image --no-server HelloWorld
-      ./helloworld
-      ./helloworld | fgrep 'Hello World'
+        propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables
 
-      # Ahead-Of-Time compilation with --static
-      $out/bin/native-image --no-server --static HelloWorld
-      ./helloworld
-      ./helloworld | fgrep 'Hello World'
-    '';
+        doInstallCheck = true;
+        installCheckPhase = ''
+          echo ${stdenv.lib.escapeShellArg ''
+                   public class HelloWorld {
+                     public static void main(String[] args) {
+                       System.out.println("Hello World");
+                     }
+                   }
+                 ''} > HelloWorld.java
+          $out/bin/javac HelloWorld.java
 
-    passthru.home = graalvm8-ee;
+          # run on JVM with Graal Compiler
+          $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
+          $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
 
-    meta = with stdenv.lib; {
-      homepage = https://www.graalvm.org/;
-      description = "High-Performance Polyglot VM";
-      license = licenses.unfree;
-      maintainers = with maintainers; [ volth hlolli ];
-      platforms = [ "x86_64-linux" ];
-    };
-  };
-in
-  graalvm8-ee
+          # Ahead-Of-Time compilation
+          $out/bin/native-image --no-server HelloWorld
+          ./helloworld
+          ./helloworld | fgrep 'Hello World'
+
+          # Ahead-Of-Time compilation with --static
+          $out/bin/native-image --no-server --static HelloWorld
+          ./helloworld
+          ./helloworld | fgrep 'Hello World'
+        '';
+
+        passthru.home = graalvmXXX-ee;
+
+        meta = with stdenv.lib; {
+          homepage = https://www.graalvm.org/;
+          description = "High-Performance Polyglot VM";
+          license = licenses.unfree;
+          maintainers = with maintainers; [ volth hlolli ];
+          platforms = [ "x86_64-linux" ];
+        };
+      };
+    in
+      graalvmXXX-ee;
+in {
+  graalvm8-ee  = common  "8";
+  graalvm11-ee = common "11";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b127412c5bb5..479dd8fa262e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8295,7 +8295,9 @@ in
 
   inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8;
 
-  graalvm8-ee = callPackage ../development/compilers/graalvm/enterprise-edition.nix { };
+  inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { })
+    graalvm8-ee
+    graalvm11-ee;
 
   openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
 

From bf38db94f13596bd7d45126dbc7c07197b09cb32 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2019 00:26:16 -0800
Subject: [PATCH 009/755] aws-checksums: 0.1.3 -> 0.1.5

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

diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix
index 124984f0d538..99cefde8937f 100644
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/pkgs/development/libraries/aws-checksums/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-checksums";
-  version = "0.1.3";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp";
+    sha256 = "018fnpn0jc686jxp5wf8qxmjphk3z43l8n1mgcgaa9zw94i24jgk";
   };
 
   nativeBuildInputs = [ cmake ];

From 072cdcb265123b40e507c427ba99f907929c6f79 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Dec 2019 04:20:00 -0500
Subject: [PATCH 010/755] podman: enable on darwin

---
 pkgs/applications/virtualization/podman/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 607d790247f8..75bc85b745a7 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -20,12 +20,14 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ];
 
-  buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ];
 
   buildPhase = ''
-    pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
+    pushd go/src/${goPackagePath}
     patchShebangs .
-    make binaries docs
+    ${if stdenv.isDarwin
+      then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all"
+      else "make binaries docs"}
   '';
 
   installPhase = ''
@@ -40,6 +42,6 @@ buildGoPackage rec {
     description = "A program for managing pods, containers and container images";
     license = licenses.asl20;
     maintainers = with maintainers; [ vdemeester saschagrunert ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From d712be5f3edbf84f1dc23124e3db1a8840307921 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Dec 2019 04:21:00 -0500
Subject: [PATCH 011/755] podman: add marsam to maintainers

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

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 75bc85b745a7..dbd05e38d3fc 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -41,7 +41,7 @@ buildGoPackage rec {
     homepage = https://podman.io/;
     description = "A program for managing pods, containers and container images";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vdemeester saschagrunert ];
+    maintainers = with maintainers; [ vdemeester saschagrunert marsam ];
     platforms = platforms.unix;
   };
 }

From 54cdd26509a69dba972ed9d8774c7f0282f6e015 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2019 21:23:48 -0800
Subject: [PATCH 012/755] asciidoctorj: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 8eaee977d288..39e7eab34abb 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "asciidoctorj";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchzip {
     url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "19fl4y3xlkmmgf5vyyb3k9p6nyglck9l53r6x12zil01q49g0zba";
+    sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 48a85e5451a96a8b2e65534f87776782de4e648e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2019 23:25:43 -0800
Subject: [PATCH 013/755] pspg: 2.6.0 -> 2.6.4

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

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index c42ea76ca856..814cdb1b3b4a 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "2.6.0";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "0cs0hsrrknl2cv39zzq4wydx5p7095hz18yly572fnniyi4ljbdg";
+    sha256 = "1sp6ign4phr5j5gg0n345wf2ssihsvqmc8lww8vddi6hiq1l86gp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a0d1a7fbee2a496102a07434f1250d36936b5393 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2019 10:27:47 -0800
Subject: [PATCH 014/755] tautulli: 2.1.38 -> 2.1.39

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

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index cbcd3c354cb4..36b561cca627 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.38";
+  version = "2.1.39";
   pname = "Tautulli";
 
   pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00kxz4i97lk3cb11vcpj894xdi7q9f1jcy29yglya8rcvsqmddwd";
+    sha256 = "1lr0pf01fxay4wppzgwp9kz2vlnnb9f8lvgfic0zgwwil2ky6b1w";
   };
 
   buildPhase = ":";

From 8482e7c7ce8df975409cf76953cc5dda738b5fdc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Dec 2019 14:10:26 +0100
Subject: [PATCH 015/755] nextcloud-client: 2.6.1 -> 2.6.2

https://github.com/nextcloud/desktop/releases/tag/v2.6.2
---
 pkgs/applications/networking/nextcloud-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 71fce57504c0..c362de2daa35 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -17,13 +17,13 @@
 
 mkDerivation rec {
   pname = "nextcloud-client";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "desktop";
     rev = "v${version}";
-    sha256 = "18318j488pxksf4zc6zag8pdpyaks55yivn91nx3x458ax6albkz";
+    sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39";
   };
 
   patches = [

From 681dca1b67840a2c608f1c1480a72aba95665f8d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 26 Dec 2019 17:39:14 +0300
Subject: [PATCH 016/755] unit: 1.13.0 -> 1.14.0

---
 pkgs/servers/http/unit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 8711be4b5c00..deda9441b0d4 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -17,14 +17,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.13.0";
+  version = "1.14.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "1b5il05isq5yvnx2qpnihsrmj0jliacvhrm58i87d48anwpv1k8q";
+    sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w";
   };
 
   nativeBuildInputs = [ which ];

From b5bd159690216f36c18c94520a29d26ebfb81f95 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 26 Dec 2019 17:51:53 +0300
Subject: [PATCH 017/755] unit: add drop capabilites patch

---
 pkgs/servers/http/unit/default.nix    |  5 ++
 pkgs/servers/http/unit/drop_cap.patch | 79 +++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/servers/http/unit/drop_cap.patch

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index deda9441b0d4..ab99f94df479 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w";
   };
 
+  patches = [
+    # https://github.com/nginx/unit/issues/357
+    ./drop_cap.patch
+  ];
+
   nativeBuildInputs = [ which ];
 
   buildInputs = [ ]
diff --git a/pkgs/servers/http/unit/drop_cap.patch b/pkgs/servers/http/unit/drop_cap.patch
new file mode 100644
index 000000000000..87caf77904e2
--- /dev/null
+++ b/pkgs/servers/http/unit/drop_cap.patch
@@ -0,0 +1,79 @@
+diff -r ed17ce89119f src/nxt_capability.c
+--- a/src/nxt_capability.c      Fri Dec 06 17:02:23 2019 +0000
++++ b/src/nxt_capability.c      Mon Dec 09 23:23:00 2019 +0000
+@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t *
+     return NXT_OK;
+ }
+ 
++
++nxt_int_t
++nxt_capability_drop_all(nxt_task_t *task)
++{
++    struct __user_cap_header_struct hdr;
++    struct __user_cap_data_struct data[2];
++
++    hdr.version = nxt_capability_linux_get_version();
++    hdr.pid = nxt_pid;
++
++    nxt_memset(data, 0, sizeof(data));
++
++    if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) {
++        nxt_alert(task, "failed to drop capabilities %E", nxt_errno);
++        return NXT_ERROR;
++    }
++
++    return NXT_OK;
++}
++
+ #else
+ 
+ static nxt_int_t
+diff -r ed17ce89119f src/nxt_capability.h
+--- a/src/nxt_capability.h      Fri Dec 06 17:02:23 2019 +0000
++++ b/src/nxt_capability.h      Mon Dec 09 23:23:00 2019 +0000
+@@ -14,4 +14,6 @@ typedef struct {
+ NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task,
+     nxt_capabilities_t *cap);
+ 
++NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task);
++
+ #endif /* _NXT_CAPABILITY_INCLUDED_ */
+diff -r ed17ce89119f src/nxt_process.c
+--- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000
++++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000
+@@ -264,7 +264,7 @@ cleanup:
+ static void
+ nxt_process_start(nxt_task_t *task, nxt_process_t *process)
+ {
+-    nxt_int_t                    ret, cap_setid;
++    nxt_int_t                    ret, cap_setid, drop_caps;
+     nxt_port_t                   *port, *main_port;
+     nxt_thread_t                 *thread;
+     nxt_runtime_t                *rt;
+@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_
+ 
+     cap_setid = rt->capabilities.setid;
+ 
++    drop_caps = cap_setid;
++
+ #if (NXT_HAVE_CLONE_NEWUSER)
+-    if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) {
++    if (NXT_CLONE_USER(init->isolation.clone.flags)) {
+         cap_setid = 1;
++        drop_caps = 0;
+     }
+ #endif
+ 
+@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_
+         if (nxt_slow_path(ret != NXT_OK)) {
+             goto fail;
+         }
++
++#if (NXT_HAVE_LINUX_CAPABILITY)
++        if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) {
++            goto fail;
++        }
++#endif
+     }
+ 
+     rt->type = init->type;
\ No newline at end of file

From 76ad649dd823d38c65c489869e763dd1869c090c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <christian.hoppner@serokell.io>
Date: Fri, 27 Dec 2019 19:32:12 +0000
Subject: [PATCH 018/755] virtualization/amazon-init: fix logging, nix path

The missing `\n` in the printf format string prevented multiple channels from
being logged.

The missing `nixpkgs=` in the `NIX_PATH` prevented `nixos-rebuild` from working
if the system configuration has any reference to `nixpkgs`.

Additionally:

* Use process substitution instead of piping printf to avoid creating a subshell.
* Set an empty `IFS` to avoid word splitting.
* Add the `-r` flag to `read` to avoid mangling backslashes.
---
 nixos/modules/virtualisation/amazon-init.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 8032b2c6d7ca..826c78a6e7ff 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -8,7 +8,7 @@ let
 
     export HOME=/root
     export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
-    export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
+    export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data
 
@@ -18,9 +18,9 @@ let
       # that as the channel.
       if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then
         channels="$(grep '^###' "$userData" | sed 's|###\s*||')"
-        printf "%s" "$channels" | while read channel; do
+        while IFS= read -r channel; do
           echo "writing channel: $channel"
-        done
+        done < <(printf "%s\n" "$channels")
 
         if [[ -n "$channels" ]]; then
           printf "%s" "$channels" > /root/.nix-channels

From 192df19a7c329d2a015a516c72c72f52ee882621 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 28 Dec 2019 22:12:45 +0300
Subject: [PATCH 019/755] nixos/unit: fix typo

---
 nixos/modules/services/web-servers/unit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix
index b07212580a55..8ce65756d1b9 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixos/modules/services/web-servers/unit/default.nix
@@ -111,7 +111,7 @@ in {
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ];
         # Security
         NoNewPrivileges = true;
-        # Sanboxing
+        # Sandboxing
         ProtectSystem = "full";
         ProtectHome = true;
         RuntimeDirectory = "unit";

From 184d0e7018bd2437c5783580508ccdb797f7f4a8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 1 Jan 2020 04:20:00 -0500
Subject: [PATCH 020/755] mutagen: init at 0.10.2

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

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
new file mode 100644
index 000000000000..7045a5b5140d
--- /dev/null
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "mutagen";
+  version = "0.10.2";
+
+  src = fetchFromGitHub {
+    owner = "mutagen-io";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0andmgzg2dbnahfh6ncnk9b7d5jlwss7rddsf9z3nmw2q3lj90iz";
+  };
+
+  modSha256 = "0zb6wqfgp5v0hpm8ad6s9lc1n3wayyqindv4vfkmp3980ikb8qwx";
+
+  subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
+
+  meta = with lib; {
+    description = "Make remote development work with your local tools";
+    homepage = "https://mutagen.io/";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bb7da688439..7c1702317fee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5129,6 +5129,8 @@ in
 
   munt = libsForQt5.callPackage ../applications/audio/munt { };
 
+  mutagen = callPackage ../tools/misc/mutagen { };
+
   mycli = callPackage ../tools/admin/mycli { };
 
   mydumper = callPackage ../tools/backup/mydumper { };

From f55358f6929b6bcae645630cbdfb799a708be7d4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 1 Jan 2020 04:20:00 -0500
Subject: [PATCH 021/755] cascadia-code: add variants

---
 pkgs/data/fonts/cascadia-code/default.nix | 45 +++++++++++++++++------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index c89d4c6dfd47..56894f920954 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,23 +1,44 @@
-{ lib, fetchurl }:
+{ stdenv, fetchurl }:
 
-let
+stdenv.mkDerivation rec {
   pname = "cascadia-code";
   version = "1911.21";
-in
-fetchurl {
-  name = "${pname}-${version}";
-  url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
 
-  downloadToTemp = true;
-  recursiveHash = true;
+  srcs = [
+    (fetchurl {
+      url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
+      sha256 = "1m5ymbngjg3n1g3p6vhcq7d825bwwln9afih651ar3jn7j9njnyg";
+     })
+    (fetchurl {
+      url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMono.ttf";
+      sha256 = "0vkhm6rhspzd1iayxrzaag099wsc94azfqa3ips7f4x9s8fmbp80";
+    })
+    (fetchurl {
+      url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMonoPL.ttf";
+      sha256 = "0xxqd8m2ydn97jngp1a3ik1mzpjbm65pfq02a82gfbbvajq5d673";
+    })
+    (fetchurl {
+      url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaPL.ttf";
+      sha256 = "1s83c9flvifd05nbhnk8knwnik7p621sr7i94smknigc7d72wqav";
+    })
+  ];
 
-  postFetch = ''
-    install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc))
+    cp $curSrc ./$ttfName
   '';
 
-  sha256 = "0b41xkpqx4ybpw5ar8njy0yznbk0hwf1ypigxf8f16chsfim7dkr";
+  sourceRoot = ".";
 
-  meta = with lib; {
+  installPhase = ''
+    install -Dm444 -t $out/share/fonts/truetype *.ttf
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1gkjs7qa409r4ykdy4ik8i0c3z49hzpklw6kyijhhifhyyyzhz4h";
+
+  meta = with stdenv.lib; {
     description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
     homepage = "https://github.com/microsoft/cascadia-code";
     license = licenses.ofl;

From d2394a478971f30867b0d0182fafcbfa50399f8f Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@mtbit.de>
Date: Thu, 2 Jan 2020 18:51:45 +0100
Subject: [PATCH 022/755] docker-slim: init at 1.26.1

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
Co-authored-by: Oleksii Filonenko <brightone@protonmail.com>
---
 pkgs/build-support/docker-slim/default.nix | 67 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/build-support/docker-slim/default.nix

diff --git a/pkgs/build-support/docker-slim/default.nix b/pkgs/build-support/docker-slim/default.nix
new file mode 100644
index 000000000000..6004898f08e5
--- /dev/null
+++ b/pkgs/build-support/docker-slim/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, buildGoPackage
+, fetchFromGitHub
+, makeWrapper
+}:
+
+let
+
+  version = "1.26.1";
+  rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1";
+
+in buildGoPackage rec {
+  pname = "docker-slim";
+  inherit version;
+
+  goPackagePath = "github.com/docker-slim/docker-slim";
+
+  src = fetchFromGitHub {
+    owner = "docker-slim";
+    repo = "docker-slim";
+    inherit rev;
+    # fetchzip yields a different hash on Darwin because `use-case-hack`
+    sha256 =
+      if stdenv.isDarwin
+      then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf"
+      else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh";
+  };
+
+  subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  # docker-slim vendorized logrus files in different directories, which
+  # conflicts on case-sensitive filesystems
+  preBuild = stdenv.lib.optionalString stdenv.isLinux ''
+    mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \
+      go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/
+  '';
+
+  buildFlagsArray =
+    let
+      ldflags = "-ldflags=-s -w " +
+                "-X ${goPackagePath}/pkg/version.appVersionTag=${version} " +
+                "-X ${goPackagePath}/pkg/version.appVersionRev=${rev}";
+    in
+      [ ldflags ];
+
+  # docker-slim tries to create its state dir next to the binary (inside the nix
+  # store), so we set it to use the working directory at the time of invocation
+  postInstall = ''
+    wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Minify and secure Docker containers";
+    homepage = "https://dockersl.im/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ filalex77 marsam mbrgm ];
+    # internal/app/sensor/monitors/ptrace/monitor.go:151:16: undefined:
+    #     system.CallNumber
+    # internal/app/sensor/monitors/ptrace/monitor.go:161:15: undefined:
+    #     system.CallReturnValue
+    badPlatforms = [ "aarch64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd59fa7bbd24..853fa9a9429c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -201,6 +201,8 @@ in
 
   docker-ls = callPackage ../tools/misc/docker-ls { };
 
+  docker-slim = callPackage ../build-support/docker-slim { };
+
   docker-sync = callPackage ../tools/misc/docker-sync { };
 
   docui = callPackage ../tools/misc/docui { };

From 0bd6bc560644ae09d02657f720b04ebc591c2032 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 6 Jan 2020 06:50:25 +0000
Subject: [PATCH 023/755] graalvm-ee: 19.3.0 -> 19.3.0.2

---
 .../compilers/graalvm/enterprise-edition.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index dacf4a350078..3166133a353e 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -5,33 +5,33 @@ let
     let
       graalvmXXX-ee = stdenv.mkDerivation rec {
         pname = "graalvm${javaVersion}-ee";
-        version = "19.3.0";
+        version = "19.3.0.2";
         srcs = [
           (requireFile {
              name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
-             sha256 = {  "8" = "dae766424457faea3bd2d7179477bab8dc073d92755ad09c51eee55ce5cb8b78";
-                        "11" = "aced0251642e942081aa386a05656bab84984999ced296b4e001ae982ac3842d";
+             sha256 = {  "8" = "0ed34a7336abec6cf854e3b2b08d4c26a492bdf221a3cf73d31b9492a21a4f9c";
+                        "11" = "ebfcf47ed88a26eecf1e85a9d515bfc07d8dbaea5f2ca3139022f60c8193698a";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "92fc421c8a07c7794179c96489ddf29d755d0a81ead2056fbf47fa137dbefc69";
-                        "11" = "fe6363ecfe919d3575607276ac6541a4f0d29cd740424b3ea7fadd26c5915106";
+             sha256 = {  "8" = "fa48268c56b47cbb71cd6bbe7ca25800b0d87fb9be7c201ec8587a50d231f071";
+                        "11" = "9e26a0cbd68470989e04749331196d403203dbf62c97154f81a11a9b8cad6969";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "2668c44a6939393983fd941fc1c5573f49a349fc0cf919f6cd0ae98b7e8fac56";
-                        "11" = "f148e1c2b78614b77ffc8c4292f62f21377e67f7359b8505fe6331d41e5a1a75";
+             sha256 = {  "8" = "c0a6bed780077e1398c43834a27d441ea459effd92d27802ab8229b3f229b76d";
+                        "11" = "218bd9c4050e72be34de3d48bada305691fcb36e367a24871223e89f2c3067be";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "e5f5938b9f55bde3f8b4e0f48f52cbb79a8668b53bbf96ab89b1da8d85bdfa90";
-                        "11" = "2481b6e2644d302c190a898e58a21cda1aa32e473d12775217a6dd4d919413ea";
+             sha256 = {  "8" = "76c776b8d2e61232e7d9ad8fcbe9d098908b62fec383288c07b7e37c2d6941c4";
+                        "11" = "f9a92ab69866edc4da6e2d906525a5bdd297f9ae0b01177c6752206343aefded";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })

From 8b42ff460cead40f173962ca05b06b0a7e3f0c82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 06:38:25 -0800
Subject: [PATCH 024/755] gthumb: 3.8.2 -> 3.8.3

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

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index f0057f3a1a88..b51db1e945fe 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gthumb";
-  version = "3.8.2";
+  version = "3.8.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q";
+    sha256 = "1a0gss9cjcwayrcpkam5kc1giwbfy38jgqxvh33in9gfq9dgrygg";
   };
 
   nativeBuildInputs = [

From 64b2dc8039d329421778119dd2b4ff83d249353c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 10 Feb 2019 18:27:02 +0100
Subject: [PATCH 025/755] pkgs/misc/cups/drivers: add brother mfcl3770cdw

This adds the printer driver for the Brother MFCL3770CDW.
It combines the cups-wrapper and the driver in one file which allows
sharing common variables and making it less error-prone than the other
Brother drivers in repository.

I volunteer for maintaining this one as long as I've got the model
around.
---
 .../drivers/brother/mfcl3770cdw/default.nix   | 88 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 92 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix

diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
new file mode 100644
index 000000000000..f101ffef95b5
--- /dev/null
+++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
@@ -0,0 +1,88 @@
+{ pkgsi686Linux
+, stdenv
+, fetchurl
+, dpkg
+, makeWrapper
+, coreutils
+, ghostscript
+, gnugrep
+, gnused
+, which
+, perl
+, lib
+}:
+
+let
+  model = "mfcl3770cdw";
+  version = "1.0.2-0";
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf103935/${model}pdrv-${version}.i386.deb";
+    sha256 = "09fhbzhpjymhkwxqyxzv24b06ybmajr6872yp7pri39595mhrvay";
+  };
+  reldir = "opt/brother/Printers/${model}/";
+
+in rec {
+  driver = pkgsi686Linux.stdenv.mkDerivation rec {
+    inherit src version;
+    name = "${model}drv-${version}";
+
+    nativeBuildInputs = [ dpkg makeWrapper ];
+
+    unpackPhase = "dpkg-deb -x $src $out";
+
+    installPhase = ''
+      dir="$out/${reldir}"
+      substituteInPlace $dir/lpd/filter_${model} \
+        --replace /usr/bin/perl ${perl}/bin/perl \
+        --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
+        --replace "PRINTER =~" "PRINTER = \"${model}\"; #"
+      wrapProgram $dir/lpd/filter_${model} \
+        --prefix PATH : ${stdenv.lib.makeBinPath [
+          coreutils ghostscript gnugrep gnused which
+        ]}
+    # need to use i686 glibc here, these are 32bit proprietary binaries
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $dir/lpd/brmfcl3770cdwfilter
+    '';
+
+    meta = {
+      description = "Brother ${lib.strings.toUpper model} driver";
+      homepage = http://www.brother.com/;
+      license = stdenv.lib.licenses.unfree;
+      platforms = [ "x86_64-linux" "i686-linux" ];
+      maintainers = [ stdenv.lib.maintainers.steveej ];
+    };
+  };
+
+  cupswrapper = stdenv.mkDerivation rec {
+    inherit version src;
+    name = "${model}cupswrapper-${version}";
+
+    nativeBuildInputs = [ dpkg makeWrapper ];
+
+    unpackPhase = "dpkg-deb -x $src $out";
+
+    installPhase = ''
+      basedir=${driver}/${reldir}
+      dir=$out/${reldir}
+      substituteInPlace $dir/cupswrapper/brother_lpdwrapper_${model} \
+        --replace /usr/bin/perl ${perl}/bin/perl \
+        --replace "basedir =~" "basedir = \"$basedir\"; #" \
+        --replace "PRINTER =~" "PRINTER = \"${model}\"; #"
+      wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \
+        --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
+      mkdir -p $out/lib/cups/filter
+      mkdir -p $out/share/cups/model
+      ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter
+      ln $dir/cupswrapper/brother_${model}_printer_en.ppd $out/share/cups/model
+    '';
+
+    meta = {
+      description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
+      homepage = http://www.brother.com/;
+      license = stdenv.lib.licenses.gpl2;
+      platforms = [ "x86_64-linux" "i686-linux" ];
+      maintainers = [ stdenv.lib.maintainers.steveej ];
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f54db64d9134..3b0bf3075558 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25155,6 +25155,10 @@ in
   mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { };
   mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { };
 
+  # This driver is only available as a 32 bit proprietary binary driver
+  mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).driver;
+  mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).cupswrapper;
+
   mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
   mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
 

From e8e7fb5c0ea498f5178a68ce4a9863d1a57e36b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 15:32:07 -0800
Subject: [PATCH 026/755] libmysofa: 0.9 -> 0.9.1

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

diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index c541159a96eb..94c454859ae0 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmysofa";
-  version = "0.9";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
     rev = "v${version}";
-    sha256 = "14k8c31xh0v4r34h89ld440j9zri4plblmlhj5ddhdmzqmh4lr9f";
+    sha256 = "10pz9n99cl2j72m7bdj8xka5akyk0sjbysr7rlfdq0qfkiq5922v";
   };
 
   nativeBuildInputs = [ cmake ];

From 141aa2285a0eda45f62d24d003b22807adb42360 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 23:45:34 -0800
Subject: [PATCH 027/755] python37Packages.asdf: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 6d685429e50b..384421c8966f 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "2.4.2";
+  version = "2.5.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wlgx8469wwsczc2gjka9k1a03yzird67zg3va0kg8y6j1qmbwvg";
+    sha256 = "1qddczr5vhlbhmzmw6bwmkrvsj8dml76zf9gnk22qzab60ali99j";
   };
 
   postPatch = ''

From 1c2e27e4d55d14f8a6d769eb9a27c0bc3c4f883e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 7 Jan 2020 21:41:28 -0500
Subject: [PATCH 028/755] nixos/systemd-lib: don't fail on systemd.packages
 duplicates

In some cases like we've noticed in https://github.com/NixOS/nixpkgs/issues/76169,
having duplicate packages in systemd.packages like
```
systemd.packages = [ gnome-shell gnome-shell gnome-session ];
```
breaks.

Here we use an associative array to ensure no
duplicate paths when we symlink all the units listed
in systemd.packages.
---
 nixos/modules/system/boot/systemd-lib.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 28ad4f121bbe..fd1a5b9f62c5 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -147,7 +147,13 @@ in rec {
       done
 
       # Symlink all units provided listed in systemd.packages.
-      for i in ${toString cfg.packages}; do
+      packages="${toString cfg.packages}"
+
+      # Filter duplicate directories
+      declare -A unique_packages
+      for k in $packages ; do unique_packages[$k]=1 ; done
+
+      for i in ''${!unique_packages[@]}; do
         for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
           if ! [[ "$fn" =~ .wants$ ]]; then
             if [[ -d "$fn" ]]; then

From b8fa6dd0ac818b5c00a48ff89454ec1ae8e6f6c2 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 8 Jan 2020 03:55:55 +0000
Subject: [PATCH 029/755] chromium: 79.0.3945.88 -> 79.0.3945.117

CVE-TBD: Use after free in audio

https://chromereleases.googleblog.com/2020/01/stable-channel-update-for-desktop.html
---
 .../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 6a4e46e74bde..85f3aa824c36 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 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
-    sha256bin64 = "1jfsswjqzdif6824p9a6raw5j9309y61c80kgfq23247vr514ky9";
-    version = "79.0.3945.88";
-  };
-  dev = {
     sha256 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969";
-    sha256bin64 = "04fscphs4w6jb1kdc25jc568r3k4x3nmg0apggjfnbdwzb5zkmf2";
+    sha256bin64 = "026gb4ypgidywvs4a031d0alv6fdphmlfybvgir4a73z8q263s26";
     version = "80.0.3987.16";
   };
+  dev = {
+    sha256 = "1bczkk2q4fk1vgx34d9qgzqz7gsf89h6gd16apwcy6063lmrsizz";
+    sha256bin64 = "1ywi3x7rc4vwsg20lci37bw97873j3vvbxxv7m2nlh4nqcs5655q";
+    version = "81.0.4000.3";
+  };
   stable = {
-    sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
-    sha256bin64 = "1k44fnn41n73j1lff4h8s8f79pw8w180n467lwff4g9izh6c2blz";
-    version = "79.0.3945.88";
+    sha256 = "1wafhpnaqwmmks4rs6x9m2b4jz4m4h27jch6gy71rk4hsy5hx5jd";
+    sha256bin64 = "1dl43a94xd7vkx8mnp3ccgq18y624fffcfnfjhxgfc02c0c6an9l";
+    version = "79.0.3945.117";
   };
 }

From 3dd33764915e134e0765497375675aaf72e85d85 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 10 Jan 2020 15:40:18 -0600
Subject: [PATCH 030/755] acpica-tools,iasl: 20191213 -> 20200110

Actually, we apparently managed to bump iasl separately
so acpica-tools are upgraded from 20191018.
---
 pkgs/development/compilers/iasl/default.nix | 4 ++--
 pkgs/tools/system/acpica-tools/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index e98d7cc27dbf..1e7a46e78072 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iasl";
-  version = "20191213";
+  version = "20200110";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h";
+    sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index 269b6a82bbca..a1c7527c46a4 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "acpica-tools";
-  version = "20191018";
+  version = "20200110";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "0pz95fb1zvsj9238bg7a4vxl1svn5mnjg10sn5qvgr008q0v9782";
+    sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From f4f3213b5780d0d3485aaad314b8a2e276b8a9b2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 10 Jan 2020 15:32:36 -0600
Subject: [PATCH 031/755] fail2ban: 0.10.4 -> 0.10.5

https://github.com/fail2ban/fail2ban/blob/0.10.5/ChangeLog

Drop included patch.
---
 pkgs/tools/security/fail2ban/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 5ea918542828..4ec84353e4ee 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, gamin }:
+{ stdenv, fetchFromGitHub, python3, gamin }:
 
-let version = "0.10.4"; in
+let version = "0.10.5"; in
 
 python3.pkgs.buildPythonApplication {
   pname = "fail2ban";
@@ -10,18 +10,9 @@ python3.pkgs.buildPythonApplication {
     owner  = "fail2ban";
     repo   = "fail2ban";
     rev    = version;
-    sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l";
+    sha256 = "1s8g46vkwhqnagj69v4wvcasypzkmq7awhfbxahffrypcpad5ach";
   };
 
-  patches = [
-    # 0.10.3 supports Python 3 but somehow this got into the way
-    # https://github.com/fail2ban/fail2ban/issues/2255
-    (fetchpatch {
-      url = "https://github.com/fail2ban/fail2ban/commit/657b147c0d7830f3600f3dc7feaa4815a7e19fde.patch";
-      sha256 = "1hrk2x7ssrfhab1wrjk5xw1sxhiv2735glfcp6qcj8x4dss3q7f7";
-    })
-  ];
-
   pythonPath = with python3.pkgs;
     stdenv.lib.optionals stdenv.isLinux [
       systemd

From 84a6071bc7df74eddbf2e1c18cde567885fc1328 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 9 Jan 2020 20:30:12 -0600
Subject: [PATCH 032/755] kernel/update.sh: always use -e

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

diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh
index dbfa052d292f..c7fcc07ea0a8 100755
--- a/pkgs/os-specific/linux/kernel/update.sh
+++ b/pkgs/os-specific/linux/kernel/update.sh
@@ -15,7 +15,7 @@ fi
 # Inspect each file and see if it has the latest version
 NIXPKGS="$(git rev-parse --show-toplevel)"
 ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
-  KERNEL="$(sed -n $LINUXSED <<< "$FILE")"
+  KERNEL="$(sed -n -e $LINUXSED <<< "$FILE")"
   [ -z "$KERNEL" ] && continue
 
   # Find the matching new kernel version
@@ -45,11 +45,11 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
     echo "Failed to get hash of $URL"
     continue
   fi
-  sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
+  sed -i -e "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
 
   # Rewrite the expression
   sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
-  sed -i "\#buildLinux (args // rec {#a \  version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
+  sed -i -e "\#buildLinux (args // rec {#a \  version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE
 
   # Commit the changes
   git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE

From 1cab2551b9a9b7ac1709924600180b21e518d273 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 8 Jan 2020 12:55:00 -0600
Subject: [PATCH 033/755] ocrmypdf: 9.2.0 -> 9.4.0

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

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 13353daa1711..3c6e606601be 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -28,14 +28,14 @@ let
 
 in buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "9.2.0";
+  version = "9.4.0";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "1mvc6x5nn242z65pxv39ch71vaikgi89bb0sjbfy2jbw91vk41xa";
+    sha256 = "07356syg7w9m9h4yl5zk2y4s8hsb7kybbm4x9vm7mli4gw9dwv1m";
   };
 
   nativeBuildInputs = with python3Packages; [

From a498f3363f08c505301db11dee7414a3646dbe02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <vn.mcsinyx@gmail.com>
Date: Sat, 11 Jan 2020 22:17:01 +0700
Subject: [PATCH 034/755] ibus-engines.table-others: 1.3.9 -> 1.3.11

---
 .../inputmethods/ibus-engines/ibus-table-others/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 5e839b354a34..b74378f07934 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table-others";
-  version = "1.3.9";
+  version = "1.3.11";
 
   src = fetchurl {
     url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
+    sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "Various table-based input methods for IBus";
-    homepage     = https://github.com/moebiuscurve/ibus-table-others;
+    homepage     = "https://github.com/moebiuscurve/ibus-table-others";
     license      = licenses.gpl3;
     platforms    = platforms.linux;
     maintainers  = with maintainers; [ mudri ];

From dc6451f08c9add6ffaacfef9382d66268ca0be70 Mon Sep 17 00:00:00 2001
From: Eric Culp <eculperic@gmail.com>
Date: Sat, 11 Jan 2020 14:25:38 -0800
Subject: [PATCH 035/755] nixos/tests/certmgr: Fix file permissions

This test has been broken since 2a413da57efc4, which stopped running the
nginx master process as root.
---
 nixos/tests/certmgr.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix
index cb69f35e862f..ef32f54400e3 100644
--- a/nixos/tests/certmgr.nix
+++ b/nixos/tests/certmgr.nix
@@ -9,8 +9,8 @@ let
     inherit action;
     authority = {
       file = {
-        group = "nobody";
-        owner = "nobody";
+        group = "nginx";
+        owner = "nginx";
         path = "/tmp/${host}-ca.pem";
       };
       label = "www_ca";
@@ -18,14 +18,14 @@ let
       remote = "localhost:8888";
     };
     certificate = {
-      group = "nobody";
-      owner = "nobody";
+      group = "nginx";
+      owner = "nginx";
       path = "/tmp/${host}-cert.pem";
     };
     private_key = {
-      group = "nobody";
+      group = "nginx";
       mode = "0600";
-      owner = "nobody";
+      owner = "nginx";
       path = "/tmp/${host}-key.pem";
     };
     request = {

From f0baa13bec31fa129f0fd06183bf46de6f9e0f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Andr=C3=A9-Chang?= <nils@nilsand.re>
Date: Sun, 12 Jan 2020 15:08:10 +0000
Subject: [PATCH 036/755] obs-wlrobs: 20191008 -> 20200111

---
 pkgs/applications/video/obs-studio/wlrobs.nix | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix
index 13a53f94590a..05b826c9cefc 100644
--- a/pkgs/applications/video/obs-studio/wlrobs.nix
+++ b/pkgs/applications/video/obs-studio/wlrobs.nix
@@ -5,28 +5,33 @@
 # nix-env -f . -iA obs-wlrobs
 # mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit
 # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit
-{ stdenv, fetchhg, wayland, obs-studio }:
+{ stdenv, fetchhg, wayland, obs-studio
+, meson, ninja, pkgconfig, libX11
+, dmabufSupport ? false, libdrm ? null, libGL ? null}:
+
+assert dmabufSupport -> libdrm != null && libGL != null;
+
 stdenv.mkDerivation {
   pname = "obs-wlrobs";
-  version = "20191008";
+  version = "20200111";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~scoopta/wlrobs";
-    rev = "82e2b93c6f662dfd9d69f7826c0096bef585c3ae";
-    sha256 = "1d2mlybkwyr0jw6paamazla2a1cyj60bs10i0lk9jclxnp780fy6";
+    rev = "8345bf985e390896d89e35e2feae1fa37722f4be";
+    sha256 = "0j01wkhwhhla4qx8mwyrq2qj9cfhxksxaq2k8rskmy2qbdkvvdpb";
   };
 
-  buildInputs = [ wayland obs-studio ];
-
-  preBuild = ''
-    cd Release
-  '';
+  buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ];
 
   installPhase = ''
     mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
     cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/
   '';
 
+  mesonFlags = [
+    "-Duse_dmabuf=${if dmabufSupport then "true" else "false"}"
+  ];
+
   meta = with stdenv.lib; {
     description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors";
     homepage = https://hg.sr.ht/~scoopta/wlrobs;

From 24c14a8fc90917cf0e2575166ac25b3cf4de3e15 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 12 Jan 2020 17:24:59 -0600
Subject: [PATCH 037/755] ocrmypdf: fix patching of leptonica lib path

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

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 3c6e606601be..a301e9310d97 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -70,8 +70,8 @@ in buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace src/ocrmypdf/leptonica.py \
-      --replace "lept = ffi.dlopen(_libpath)" \
-      'lept = ffi.dlopen("${stdenv.lib.makeLibraryPath [leptonica]}/liblept${stdenv.hostPlatform.extensions.sharedLibrary}")'
+      --replace '_libpath = find_library(libname)' \
+                '_libpath = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';
 
   # The tests take potentially 20+ minutes, depending on machine

From 21f567bdd9e9abe1ce8d0a2b6595670ba9f2682b Mon Sep 17 00:00:00 2001
From: Eric Culp <eculperic@gmail.com>
Date: Sun, 12 Jan 2020 15:49:17 -0800
Subject: [PATCH 038/755] test-driver.py: Share the shared dir between VMs

This changes the python test driver to match the behavior of the perl
test driver.  I.e. the directory mounted into /tmp/shared should be the
same for all machines.

This probably fixes many tests, but I found this while investigating
failures in nixos/tests/ceph-multi-node.nix.
---
 nixos/lib/test-driver/test-driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 7e575189209a..d5212413284a 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -221,7 +221,7 @@ class Machine:
             return path
 
         self.state_dir = create_dir("vm-state-{}".format(self.name))
-        self.shared_dir = create_dir("{}/xchg".format(self.state_dir))
+        self.shared_dir = create_dir("shared-xchg")
 
         self.booted = False
         self.connected = False

From 1e3ac890951728aba315f7d7a5204d551ede76d3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 1 Jan 2020 01:35:57 -0600
Subject: [PATCH 039/755] spectral: unstable-2019-08-30 -> 817

* libsecret, now req'd
* url updates
---
 .../instant-messengers/spectral/default.nix    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 314a3bb64571..23659e8a6c9c 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -7,34 +7,32 @@
 , qtgraphicaleffects
 , qtdeclarative
 , qtmacextras
-, olm, cmark
+, olm, libsecret, cmark
 }:
 
 let qtkeychain-qt5 = qtkeychain.override {
   inherit qtbase qttools;
   withQt5 = true;
 };
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   pname = "spectral";
-  version = "unstable-2019-08-30";
+  version = "817";
 
   src = fetchgit {
-    url = "https://gitlab.com/b0/spectral.git";
-    rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
-    sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
+    url = "https://gitlab.com/spectral-im/spectral.git";
+    rev = version;
+    sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1";
     fetchSubmodules = true;
   };
 
-  #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
-
   nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
-  buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
+  buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ]
     ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
     ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
 
   meta = with stdenv.lib; {
     description = "A glossy cross-platform Matrix client.";
-    homepage = "https://gitlab.com/b0/spectral";
+    homepage = "https://spectral.im";
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ dtzWill ];

From 7d52215f14986075477ce2052b690109b9116786 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 7 Jan 2020 17:01:53 -0600
Subject: [PATCH 040/755] olm: build w/cmake, simplify expression (somewhat
 optimistically)

---
 pkgs/development/libraries/olm/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 8fbdf28965bf..f63d1d30f558 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "olm";
@@ -9,17 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w";
   };
 
+  nativeBuildInputs = [ cmake ];
+
   doCheck = true;
-  checkTarget = "test";
-
-  # requires optimisation but memory operations are compiled with -O0
-  hardeningDisable = ["fortify"];
-
-  makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc";
-
-  installFlags = [
-    "PREFIX=${placeholder ''out''}"
-  ];
 
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";

From e4fa8192da5269756ec225b99f9693e6e702c207 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 13 Jan 2020 02:40:44 +0900
Subject: [PATCH 041/755] nixos/tests/ec2: return to passing state

Updates required:

- Use vpc image format (new default, supported by Amazon)
- Pass full image filename to makeEc2Test
- Increase memory allocation for nixos-rebuild
- Set a networking.hostName for services.httpd
- Add appropriate escaping in literal userdata

While I'm here, try to make it fail fast.
---
 nixos/tests/common/ec2.nix      |  4 +--
 nixos/tests/ec2.nix             | 43 ++++++++++++++++++++++++---------
 nixos/tests/openstack-image.nix |  2 +-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix
index 1e69b63191a7..ba087bb60090 100644
--- a/nixos/tests/common/ec2.nix
+++ b/nixos/tests/common/ec2.nix
@@ -25,7 +25,7 @@ with pkgs.lib;
           my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine";
           mkdir $imageDir, 0700;
           my $diskImage = "$imageDir/machine.qcow2";
-          system("qemu-img create -f qcow2 -o backing_file=${image}/nixos.qcow2 $diskImage") == 0 or die;
+          system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die;
           system("qemu-img resize $diskImage 10G") == 0 or die;
 
           # Note: we use net=169.0.0.0/8 rather than
@@ -35,7 +35,7 @@ with pkgs.lib;
           # again when it deletes link-local addresses.) Ideally we'd
           # turn off the DHCP server, but qemu does not have an option
           # to do that.
-          my $startCommand = "qemu-kvm -m 768";
+          my $startCommand = "qemu-kvm -m 1024";
           $startCommand .= " -device virtio-net-pci,netdev=vlan0";
           $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
           $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index c649ce852dad..6aeeb17ba31a 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
 with import common/ec2.nix { inherit makeTest pkgs; };
 
 let
-  image =
+  imageCfg =
     (import ../lib/eval-config.nix {
       inherit system;
       modules = [
@@ -26,20 +26,32 @@ let
             '';
 
           # Needed by nixos-rebuild due to the lack of network
-          # access. Mostly copied from
-          # modules/profiles/installation-device.nix.
+          # access. Determined by trial and error.
           system.extraDependencies =
-            with pkgs; [
-              stdenv busybox perlPackages.ArchiveCpio unionfs-fuse mkinitcpio-nfs-utils
+            with pkgs; (
+              [
+                # Needed for a nixos-rebuild.
+                busybox
+                stdenv
+                stdenvNoCC
+                mkinitcpio-nfs-utils
+                unionfs-fuse
+                cloud-utils
+                desktop-file-utils
+                texinfo
+                libxslt.bin
+                xorg.lndir
 
-              # These are used in the configure-from-userdata tests for EC2. Httpd and valgrind are requested
-              # directly by the configuration we set, and libxslt.bin is used indirectly as a build dependency
-              # of the derivation for dbus configuration files.
-              apacheHttpd valgrind.doc libxslt.bin
-            ];
+                # These are used in the configure-from-userdata tests
+                # for EC2. Httpd and valgrind are requested by the
+                # configuration.
+                apacheHttpd apacheHttpd.doc apacheHttpd.man valgrind.doc
+              ]
+            );
         }
       ];
-    }).config.system.build.amazonImage;
+    }).config;
+  image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd";
 
   sshKeys = import ./ssh-keys.nix pkgs;
   snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
@@ -110,16 +122,23 @@ in {
           text = "whoa";
         };
 
+        networking.hostName = "ec2-test-vm"; # required by services.httpd
+
         services.httpd = {
           enable = true;
           adminAddr = "test@example.org";
-          virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+          virtualHosts.localhost.documentRoot = "''${pkgs.valgrind.doc}/share/doc/valgrind/html";
         };
         networking.firewall.allowedTCPPorts = [ 80 ];
       }
     '';
     script = ''
       $machine->start;
+
+      # amazon-init must succeed. if it fails, make the test fail
+      # immediately instead of timing out in waitForFile.
+      $machine->waitForUnit('amazon-init.service');
+
       $machine->waitForFile("/etc/testFile");
       $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
 
diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix
index d0225016ab76..8a21dd1b599e 100644
--- a/nixos/tests/openstack-image.nix
+++ b/nixos/tests/openstack-image.nix
@@ -17,7 +17,7 @@ let
         ../modules/testing/test-instrumentation.nix
         ../modules/profiles/qemu-guest.nix
       ];
-    }).config.system.build.openstackImage;
+    }).config.system.build.openstackImage + "/nixos.qcow2";
 
   sshKeys = import ./ssh-keys.nix pkgs;
   snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;

From fe4d21309130e05608b770904158f18e018a8080 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Mon, 13 Jan 2020 08:57:06 +0100
Subject: [PATCH 042/755] ceph: 14.2.5 -> 14.2.6

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

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 9c7704410251..f3e985edbff6 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -92,7 +92,7 @@ let
     ps.pyyaml
   ]);
 
-  version = "14.2.5";
+  version = "14.2.6";
 in rec {
   ceph = stdenv.mkDerivation {
     pname = "ceph";
@@ -100,7 +100,7 @@ in rec {
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c";
+      sha256 = "0qkyrb25r2a57n6k8ncb43x7hvhkmpi7abhfyi98mlz2lhmhzlm1";
     };
 
     patches = [

From 9d28b0b95e6fb13eec4181cfb1e5113e00e92248 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Mon, 13 Jan 2020 13:59:40 +0200
Subject: [PATCH 043/755] psi-plus: 1.4.904 -> 1.4.984

Also fix 'ld: cannot find -lsecret-1 error' on build and crash with 'This application failed to start because no Qt platform plugin could be initialized' error on startup.
---
 .../instant-messengers/psi-plus/default.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index d7741bda646e..010c06e0c2ac 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake
+{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
 , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
-, libidn, qca2-qt5, qtkeychain, libXScrnSaver, hunspell
+, libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell
 , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
 }:
 
 stdenv.mkDerivation rec {
   pname = "psi-plus";
-  version = "1.4.904";
+  version = "1.4.984";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = version;
-    sha256 = "1bs7yk3qp91sm8nb9gna8vm59381afn1wfs7aii9yi29bhx6fw9h";
+    sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7";
   };
 
   resources = fetchFromGitHub {
     owner = "psi-plus";
     repo = "resources";
-    rev = "182c92ca0bcc055579d8c91bccba9efe157e77a9";
-    sha256 = "06k7q63cxpifpzjnlw1snclkr2mwf9fh71cgfd40n7jgzswzwhpb";
+    rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73";
+    sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2";
   };
 
   postUnpack = ''
@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
     "-DENABLE_PLUGINS=ON"
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
 
   buildInputs = [
     qtbase qtmultimedia qtx11extras qttools qtwebengine
-    libidn qca2-qt5 qtkeychain libXScrnSaver hunspell
+    libidn qca2-qt5 libsecret libXScrnSaver hunspell
     libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
   ];
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "XMPP (Jabber) client";
-    maintainers = with maintainers; [ orivej ];
+    maintainers = with maintainers; [ orivej misuzu ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From f005f2d350257d6cd616685ff4f189e45f7a486a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 13 Jan 2020 21:28:24 +0800
Subject: [PATCH 044/755] calibre: 3.48 -> 4.8

---
 pkgs/applications/misc/calibre/default.nix | 86 +++++++++++++++++-----
 1 file changed, 69 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 9701db3c0b79..fd86f21dff0d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,7 +1,27 @@
-{ lib, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
-, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
-, xdg_utils, makeDesktopItem, removeReferencesTo
+{ lib
+, mkDerivation
+, fetchurl
+, poppler_utils
+, pkgconfig
+, libpng
+, imagemagick
+, libjpeg
+, fontconfig
+, podofo
+, qtbase
+, qmake
+, icu
+, sqlite
+, hunspell
+, hyphen
+, unrarSupport ? false
+, chmlib
+, python2Packages
+, libusb1
+, libmtp
+, xdg_utils
+, makeDesktopItem
+, removeReferencesTo
 }:
 
 let
@@ -10,11 +30,11 @@ let
 in
 mkDerivation rec {
   pname = "calibre";
-  version = "3.48.0";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "034m89h7j2088p324i1kya33dfldmqyynjxk3w98xiqkz7q2hi82";
+    sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk";
   };
 
   patches = [
@@ -44,17 +64,49 @@ mkDerivation rec {
   CALIBRE_PY3_PORT = builtins.toString pypkgs.isPy3k;
 
   buildInputs = [
-    poppler_utils libpng imagemagick libjpeg
-    fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
-  ] ++ (with pypkgs; [
-    apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow
-    python pyqt5_with_qtwebkit sip
-    regex msgpack beautifulsoup4 html2text
-    # the following are distributed with calibre, but we use upstream instead
-    odfpy
-  ]) ++ lib.optionals (!pypkgs.isPy3k) (with pypkgs; [
-    mechanize
-  ]);
+    poppler_utils
+    libpng
+    imagemagick
+    libjpeg
+    fontconfig
+    podofo
+    qtbase
+    chmlib
+    icu
+    hunspell
+    hyphen
+    sqlite
+    libusb1
+    libmtp
+    xdg_utils
+  ] ++ (
+    with pypkgs; [
+      apsw
+      cssselect
+      css-parser
+      dateutil
+      dnspython
+      feedparser
+      html5-parser
+      lxml
+      markdown
+      netifaces
+      pillow
+      python
+      pyqt5_with_qtwebkit
+      sip
+      regex
+      msgpack
+      beautifulsoup4
+      html2text
+      # the following are distributed with calibre, but we use upstream instead
+      odfpy
+    ]
+  ) ++ lib.optionals (!pypkgs.isPy3k) (
+    with pypkgs; [
+      mechanize
+    ]
+  );
 
   installPhase = ''
     runHook preInstall

From d6a98987717b31e2d89b267608ea6c90bd5eea56 Mon Sep 17 00:00:00 2001
From: Leonhard Markert <curiousleo@users.noreply.github.com>
Date: Fri, 10 Jan 2020 12:59:28 +0100
Subject: [PATCH 045/755] CONTRIBUTING.md: add section "Backporting changes"

---
 .github/CONTRIBUTING.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 706952b208db..a50a8a507de3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -48,6 +48,15 @@ In addition to writing properly formatted commit messages, it's important to inc
 
 For package version upgrades and such a one-line commit message is usually sufficient.
 
+## Backporting changes
+
+To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
+
+1. Take note of the commit in which the change was introduced into `master`.
+2. Check out the target _release branch_, e.g. `release-19.09`. Do not use a _channel branch_ like `nixos-19.09` or `nixpkgs-19.09`.
+3. Use `git cherry-pick -x <original commit>`.
+4. Open your backport PR. Make sure to select the release branch (e.g. `release-19.09`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
+
 ## Reviewing contributions
 
 See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).

From 9974bb16b098ee33c2b449125cd4b89493ade164 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Tue, 14 Jan 2020 10:37:52 +0100
Subject: [PATCH 046/755] systemd-networkd: add configuration for XFRM
 interfaces

---
 nixos/modules/system/boot/networkd.nix | 40 ++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 3e289a63139f..56a9d6b11380 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -49,7 +49,7 @@ let
     (assertValueOneOf "Kind" [
       "bond" "bridge" "dummy" "gre" "gretap" "ip6gre" "ip6tnl" "ip6gretap" "ipip"
       "ipvlan" "macvlan" "macvtap" "sit" "tap" "tun" "veth" "vlan" "vti" "vti6"
-      "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim"
+      "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" "xfrm"
     ])
     (assertByteFormat "MTUBytes")
     (assertMacAddress "MACAddress")
@@ -172,6 +172,14 @@ let
     (assertValueOneOf "AllSlavesActive" boolValues)
   ];
 
+  checkXfrm = checkUnitConfig "Xfrm" [
+    (assertOnlyFields [
+      "InterfaceId" "Independent"
+    ])
+    (assertRange "InterfaceId" 1 4294967295)
+    (assertValueOneOf "Independent" boolValues)
+  ];
+
   checkNetwork = checkUnitConfig "Network" [
     (assertOnlyFields [
       "Description" "DHCP" "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute"
@@ -182,7 +190,7 @@ let
       "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress"
       "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN"
       "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave"
-      "ConfigureWithoutCarrier"
+      "ConfigureWithoutCarrier" "Xfrm"
     ])
     # Note: For DHCP the values both, none, v4, v6 are deprecated
     (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"])
@@ -477,6 +485,18 @@ let
       '';
     };
 
+    xfrmConfig = mkOption {
+      default = {};
+      example = { InterfaceId = 1; };
+      type = types.addCheck (types.attrsOf unitOption) checkXfrm;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Xfrm]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
   };
 
   addressOptions = {
@@ -712,6 +732,16 @@ let
       '';
     };
 
+    xfrm = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of xfrm interfaces to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
     addresses = mkOption {
       default = [ ];
       type = with types; listOf (submodule addressOptions);
@@ -809,6 +839,11 @@ let
             [Bond]
             ${attrsToSection def.bondConfig}
 
+          ''}
+          ${optionalString (def.xfrmConfig != { }) ''
+            [Xfrm]
+            ${attrsToSection def.xfrmConfig}
+
           ''}
           ${optionalString (def.wireguardConfig != { }) ''
             [WireGuard]
@@ -847,6 +882,7 @@ let
           ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}
           ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}
           ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)}
+          ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)}
 
           ${optionalString (def.dhcpConfig != { }) ''
             [DHCP]

From 12be3fc711c2bfec9c2e3bd86c0420d14df29cbf Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Jan 2020 16:45:29 -0600
Subject: [PATCH 047/755] libsecret: 0.19.1 -> 0.20.0

https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.0
---
 pkgs/development/libraries/libsecret/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index ca2449adefd5..ce22199b7fbe 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5";
+    sha256 = "0hxfpm8f4rlx685igd4bv89wb80v2952h373g3w6l42kniq7667i";
   };
 
   postPatch = ''

From ad4f0ffc796a72ff2c70a0626954ea916ed461b4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Jan 2020 16:48:52 -0600
Subject: [PATCH 048/755] libsecret: fix build, upstream commit

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

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index ce22199b7fbe..3cbee96c8514 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
 , libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0hxfpm8f4rlx685igd4bv89wb80v2952h373g3w6l42kniq7667i";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "rename-internal-functions-to-avoid-conflicts-and-fix-build.patch";
+      url = "https://gitlab.gnome.org/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8.patch";
+      sha256 = "1n9nyzq5qrvw7s6sj5gzj33ia3rrx719jpys1cfhfbayg2sxyd4n";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .
   '';

From 241e9c10bac2a3b5918e98930b31658df24cbe8c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Wed, 15 Jan 2020 05:39:12 +0100
Subject: [PATCH 049/755] nixos/docs: Fix nixos-install --system command

---
 nixos/doc/manual/man-nixos-install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 0752c397182f..9255ce763efe 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -210,7 +210,7 @@
       The closure must be an appropriately configured NixOS system, with boot
       loader and partition configuration that fits the target host. Such a
       closure is typically obtained with a command such as <command>nix-build
-      -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system
+      -I nixos-config=./configuration.nix '&lt;nixpkgs/nixos&gt;' -A system
       --no-out-link</command>
      </para>
     </listitem>

From 869d157cc1bafc5d63cceffe167a73428a1605df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2020 06:40:19 +0000
Subject: [PATCH 050/755] avocode: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 3595908f1437..f15804038e71 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "06g12gqri1sgfklla6jfpi7wm2qjazakcjs2w2rhrphnl50r6ca7";
+    sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [

From 26165d98dfba75add441aeb7a3839049278140f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2020 06:48:02 +0000
Subject: [PATCH 051/755] armTrustedFirmwareTools: 2.1 -> 2.2

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

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 27bef4cae449..ead87f6fab43 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -6,7 +6,7 @@ let
             , platform ? null
             , extraMakeFlags ? []
             , extraMeta ? {}
-            , version ? "2.1"
+            , version ? "2.2"
             , ... } @ args:
            stdenv.mkDerivation ({
 
@@ -17,7 +17,7 @@ let
       owner = "ARM-software";
       repo = "arm-trusted-firmware";
       rev = "refs/tags/v${version}";
-      sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r";
+      sha256 = "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];

From 51f055f2776698280b78ba93621476df9523563c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2020 08:14:12 +0000
Subject: [PATCH 052/755] dar: 2.6.6 -> 2.6.7

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

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index f48bfbd3d6a2..5d5bff7bfa1e 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.6.6";
+  version = "2.6.7";
   pname = "dar";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "1pqdcb9dkjlf8wzpsnx4gcv9nhrm60glv4xadxnknnqlvzs6vips";
+    sha256 = "055kkxhg7sz3fbndsr4p2wp7aa2phq3pr0a9y7b1fkg52x7fbhr2";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From b37b32e98af487b2c22895ab0ba0da005cbcf1c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2020 10:48:23 +0000
Subject: [PATCH 053/755] dyncall: 1.0 -> 1.1

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

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index cfc95de15552..05fa582fb628 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation {
   pname = "dyncall";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchurl {
-    url = http://www.dyncall.org/r1.0/dyncall-1.0.tar.gz;
-    # http://www.dyncall.org/r1.0/SHA256
-    sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
+    url = http://www.dyncall.org/r1.1/dyncall-1.1.tar.gz;
+    # http://www.dyncall.org/r1.1/SHA256
+    sha256 = "15c7x0k921lm5mml8gap2rkz3md7d56slp136kzk5f1d2hzzm5yg";
   };
 
   # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)

From 1ed242a3a2307457f03b8a7f820ec4089de9e583 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2020 11:02:17 +0000
Subject: [PATCH 054/755] doodle: 0.7.0 -> 0.7.1

---
 pkgs/applications/search/doodle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix
index ba9fbee5d969..9d1da21492a2 100644
--- a/pkgs/applications/search/doodle/default.nix
+++ b/pkgs/applications/search/doodle/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libextractor, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "doodle-0.7.0";
+  name = "doodle-0.7.1";
 
   buildInputs = [ libextractor gettext ];
 
   src = fetchurl {
     url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz";
-    sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j";
+    sha256 = "086va4q8swiablv5x72yikrdh5swhy7kzmg5wlszi5a7vjya29xw";
   };
 
   meta = {

From 6b11639a2de18b73ef3f79b7636348f6ce47f378 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 15 Jan 2020 06:45:44 -0600
Subject: [PATCH 055/755] dyncall: https, use upstream-provided SHA256

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

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 05fa582fb628..83c754e29286 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -5,9 +5,9 @@ stdenv.mkDerivation {
   version = "1.1";
 
   src = fetchurl {
-    url = http://www.dyncall.org/r1.1/dyncall-1.1.tar.gz;
-    # http://www.dyncall.org/r1.1/SHA256
-    sha256 = "15c7x0k921lm5mml8gap2rkz3md7d56slp136kzk5f1d2hzzm5yg";
+    url = https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz;
+    # https://www.dyncall.org/r1.1/SHA256
+    sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795";
   };
 
   # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Highly dynamic multi-platform foreign function call interface library";
-    homepage = http://www.dyncall.org;
+    homepage = https://www.dyncall.org;
     license = licenses.isc;
     maintainers = with maintainers; [ dtzWill ];
   };

From 807e08c9a3bc78569d347e01653c8e99d28ad698 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 15 Jan 2020 18:34:11 +0000
Subject: [PATCH 056/755] graalvm: 19.3.0.2 -> 19.3.1

---
 .../compilers/graalvm/enterprise-edition.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index 3166133a353e..c34c4695a236 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -5,33 +5,33 @@ let
     let
       graalvmXXX-ee = stdenv.mkDerivation rec {
         pname = "graalvm${javaVersion}-ee";
-        version = "19.3.0.2";
+        version = "19.3.1";
         srcs = [
           (requireFile {
              name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
-             sha256 = {  "8" = "0ed34a7336abec6cf854e3b2b08d4c26a492bdf221a3cf73d31b9492a21a4f9c";
-                        "11" = "ebfcf47ed88a26eecf1e85a9d515bfc07d8dbaea5f2ca3139022f60c8193698a";
+             sha256 = {  "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82";
+                        "11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "fa48268c56b47cbb71cd6bbe7ca25800b0d87fb9be7c201ec8587a50d231f071";
-                        "11" = "9e26a0cbd68470989e04749331196d403203dbf62c97154f81a11a9b8cad6969";
+             sha256 = {  "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702";
+                        "11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "c0a6bed780077e1398c43834a27d441ea459effd92d27802ab8229b3f229b76d";
-                        "11" = "218bd9c4050e72be34de3d48bada305691fcb36e367a24871223e89f2c3067be";
+             sha256 = {  "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d";
+                        "11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "76c776b8d2e61232e7d9ad8fcbe9d098908b62fec383288c07b7e37c2d6941c4";
-                        "11" = "f9a92ab69866edc4da6e2d906525a5bdd297f9ae0b01177c6752206343aefded";
+             sha256 = {  "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290";
+                        "11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })

From 4c8bbe93c93876bff38402ca4e53fd651970b206 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 15 Jan 2020 23:01:32 +0300
Subject: [PATCH 057/755] openxray: fix build

---
 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 ced358bb501a..17fb54d3c611 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23124,9 +23124,7 @@ in
 
   openxcom = callPackage ../games/openxcom { };
 
-  openxray = callPackage ../games/openxray {
-    stdenv = gcc8Stdenv;
-  };
+  openxray = callPackage ../games/openxray { };
 
   orthorobot = callPackage ../games/orthorobot { };
 

From 725fd9feda147d2f5e772d8ea5d878f38dfcf50e Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Tue, 14 Jan 2020 22:44:44 -0800
Subject: [PATCH 058/755] bs-platform: don't build a development binary

---
 pkgs/development/compilers/bs-platform/build-bs-platform.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 03e01a7a0da5..830a0b647c42 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -35,11 +35,12 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
-    node scripts/ninja.js build
+    # This is an unfortunate name, but it's actually how to build a release
+    # binary for BuckleScript
+    node scripts/install.js
   '';
 
   installPhase = ''
-    node scripts/install.js
     mkdir -p $out/bin
     cp -rf jscomp lib vendor odoc_gen native $out
     cp bsconfig.json package.json $out

From 0e76e3bb480f488e2803e56073dbadf2bd6c37cc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 15 Jan 2020 18:18:18 -0500
Subject: [PATCH 059/755] postgresqlPackages.timescaledb: 1.5.1 -> 1.6.0

Changelog: https://github.com/timescale/timescaledb/releases/tag/1.6.0
---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 0427de60aa52..6f0ec04cd752 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb";
-  version = "1.5.1";
+  version = "1.6.0";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "1mgmkc42nksfsmjg463v03rj1v8gybwlzzi515gxz6ijx8604w4c";
+    sha256 = "0b42rhkycr4pwwa4fxnmppd3bl0xz7azvlm145rd7warlsr5h0lb";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];

From f64bcd6cca86d3b4f400954deabbc7d49dffa688 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Jan 2020 15:45:59 +1000
Subject: [PATCH 060/755] crun: 0.10.6 -> 0.11

---
 pkgs/applications/virtualization/crun/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 9376adf8d6a8..6fc60780ba7f 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.10.6";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
+    sha256 = "0mn64hrgx4a7mhqjxn127i8yivhn1grp93wws1da1ffj4ap6ay76";
     fetchSubmodules = true;
   };
 
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preBuild = ''
+    cat > git-version.h <<EOF
+    #ifndef GIT_VERSION
+    # define GIT_VERSION "nixpkgs-${version}"
+    #endif
+    EOF
+  '';
+
   # the tests require additional permissions
   doCheck = false;
 

From 080da6a65f29ac80848da4a616ffcf8b10a3a5f4 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 16 Jan 2020 13:09:01 +0200
Subject: [PATCH 061/755] yle-dl: add setuptools dependency

yle-dl was failing with the following error:

  ImportError: No module named pkg_resources

Adding setuptools to propagatedBuildInputs fixes this issue.
---
 pkgs/tools/misc/yle-dl/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index d369bb4fed78..e106c3b8595a 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -11,7 +11,9 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests future ffmpeg ];
+  propagatedBuildInputs = with pythonPackages; [
+    lxml pyamf pycrypto requests future ffmpeg setuptools
+  ];
   pythonPath = [ rtmpdump php ];
 
   doCheck = false; # tests require network access

From 29a8575e3d5cad041e58643a58d6b1c79079b8e5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 16 Jan 2020 12:51:47 +0100
Subject: [PATCH 062/755] buildRustCrate: remove one of the odd library
 filename cases

It used to be the case (ref missing) that cargo did treat
`src/$libName.rs` as an alternative to `src/lib.rs` when the latter
wasn't present. Recently I failed to reproduce that with vanilla cargo
and it started to cause pain with some crates of the form:

some_crate/
 `- src
   `- main.rs
   `- some_crate.rs

We would build `src/some_crate.rs` and thing it is a library while that
might not be the actual case. This crate is a valid `bin` crate not a
`lib` crate as far as I can tell from the samples I took.

I removed support for the previously required heuristic and commented
out the test cases in case we will need them again. We could crawl in
the Git history but chances are that the next person looking into this
doesn't know about the history.
---
 .../rust/build-rust-crate/build-crate.nix      |  3 ---
 .../rust/build-rust-crate/test/default.nix     | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 4e2e2af1aa77..dec49d24f524 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -55,9 +55,6 @@
     elif [[ -e src/lib.rs ]]; then
        build_lib src/lib.rs
        ${lib.optionalString buildTests "build_lib_test src/lib.rs"}
-    elif [[ -e "src/$LIB_NAME.rs" ]]; then
-       build_lib src/$LIB_NAME.rs
-       ${lib.optionalString buildTests ''build_lib_test "src/$LIB_NAME.rs"''}
     fi
 
 
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index f0f1ed4d1ebf..aa20bd03b189 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -92,7 +92,17 @@ let
     cases = {
       libPath =  { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; };
       srcLib =  { src = mkLib "src/lib.rs"; };
-      customLibName =  { libName = "test_lib"; src = mkLib "src/test_lib.rs"; };
+
+      # This used to be supported by cargo but as of 1.40.0 I can't make it work like that with just cargo anymore.
+      # This might be a regression or deprecated thing they finally removed…
+      # customLibName =  { libName = "test_lib"; src = mkLib "src/test_lib.rs"; };
+      # rustLibTestsCustomLibName = {
+      #   libName = "test_lib";
+      #   src = mkTestFile "src/test_lib.rs" "foo";
+      #   buildTests = true;
+      #   expectedTestOutputs = [ "test foo ... ok" ];
+      # };
+
       customLibNameAndLibPath =  { libName = "test_lib"; libPath = "src/best-lib.rs"; src = mkLib "src/best-lib.rs"; };
       crateBinWithPath =  { crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; src = mkBin "src/foobar.rs"; };
       crateBinNoPath1 =  { crateBin = [{ name = "my-binary2"; }]; src = mkBin "src/my_binary2.rs"; };
@@ -122,12 +132,6 @@ let
         buildTests = true;
         expectedTestOutputs = [ "test baz ... ok" ];
       };
-      rustLibTestsCustomLibName = {
-        libName = "test_lib";
-        src = mkTestFile "src/test_lib.rs" "foo";
-        buildTests = true;
-        expectedTestOutputs = [ "test foo ... ok" ];
-      };
       rustLibTestsCustomLibPath = {
         libPath = "src/test_path.rs";
         src = mkTestFile "src/test_path.rs" "bar";

From 69c96adc53fb7edb909d3682e361f59469b834ef Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 16 Jan 2020 13:19:50 +0100
Subject: [PATCH 063/755] buildRustCrateTests: use releaseTools.aggregate

Previously I did use `runCommand` to do the same. Using
releaseTools.aggregate seems a lot saner and we might get nicer hydra
output of the tests that are failing.
---
 .../rust/build-rust-crate/test/default.nix        | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index aa20bd03b189..aefa279fc5e9 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }:
+{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }:
 let
   mkCrate = args: let
       p = {
@@ -211,9 +211,12 @@ let
       test -e ${pkg}/bin/brotli-decompressor && touch $out
     '';
   };
-  test = runCommand "run-buildRustCrate-tests" {
-    nativeBuildInputs = builtins.attrValues tests;
-  } "
-    touch $out
-  ";
+  test = releaseTools.aggregate {
+    name = "buildRustCrate-tests";
+    meta = {
+      description = "Test cases for buildRustCrate";
+      maintainers = [ lib.maintainers.andir ];
+    };
+    constituents = builtins.attrValues tests;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4acd88db2e38..6310d3b30e87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8714,7 +8714,7 @@ in
 
   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;
+  buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
   cratesIO = callPackage ../build-support/rust/crates-io.nix { };
 
   cargo-web = callPackage ../development/tools/cargo-web {

From 57d90bd04c399ce599257c6e90e2576fb9300ada Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 16 Jan 2020 20:09:18 +0100
Subject: [PATCH 064/755] xcape: correctly format version

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

diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
index 8b0c18c86184..d1b6f9b23b6d 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -3,7 +3,7 @@ libXi }:
 
 stdenv.mkDerivation rec {
   pname = "xcape";
-  version = "unstable-20180301";
+  version = "unstable-2018-03-01";
 
   src = fetchFromGitHub {
     owner = "alols";

From 14dd35ed30d53ec278779e4028a08d021f1d92dc Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 16 Jan 2020 20:16:40 +0100
Subject: [PATCH 065/755] libevdevplus: correctly format version

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

diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix
index f538aab64adf..0f2b3e052665 100644
--- a/pkgs/development/libraries/libevdevplus/default.nix
+++ b/pkgs/development/libraries/libevdevplus/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libevdevplus";
-  version = "2019-10-01";
+  version = "unstable-2019-10-01";
 
   src  = fetchFromGitHub {
     owner  = "YukiWorkshop";

From 67b968a9ecf6b84b2e1f63ae91c4afa6fb6f831e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 16 Jan 2020 20:18:29 +0100
Subject: [PATCH 066/755] zsh-powerlevel10k: unstable-2019-12-19 -> 1.0

---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index d5081476efb5..5b649a3923e2 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation {
   pname = "powerlevel10k";
-  version = "unstable-2019-12-19";
+  version = "1.0";
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
-    rev = "8ef2b737d1f6099966a1eb16bdfc90d67b367f22";
-    sha256 = "02b25klkyyhpdbf2vwzzbrd8hnfjpckbpjy6532ir6jqp2n2ivpj";
+    rev = "c21961b53c137253020aeffca2b132fdd6bcb116";
+    sha256 = "1jp6jhw5kb10d76zkxdv8c04s51ilmjka336bgnllya9nyqaqpxp";
   };
 
   patches = [

From f8eb39bc3bdc42ec51ba51a6d104c9ea6c2d53c3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 16 Jan 2020 20:33:13 +0100
Subject: [PATCH 067/755] mcfly: correctly format version

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

diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index db697bc9d511..4ea27ce092f7 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -2,13 +2,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mcfly";
-  version = "v0.3.1";
-  rev = version;
+  version = "0.3.1";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "cantino";
     repo = "mcfly";
+    rev = "v${version}";
     sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2";
   };
 

From 509e0a0057bee17dab43efbe4ad1529c381a323b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Jan 2020 17:06:29 -0600
Subject: [PATCH 068/755] bibata-cursors: fix installation, don't generate
 unused w32 artifacts

This fixes issue where each theme installed the entire
build directory, not just the final generated 'out/X11' files.

(which was wasteful but also meant they didn't work
as the right files were two directories deeper)

Avoiding the w32 saves some time and sapce,
and more is "saved" by not shipping non-cursor build intermediates.

Sorry for the bad update, folks!
---
 pkgs/data/icons/bibata-cursors/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
index cfe65d80bd84..d2e35136a8be 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -16,6 +16,11 @@ in stdenvNoCC.mkDerivation rec {
   postPatch = ''
     patchShebangs .
     substituteInPlace build.sh --replace "sudo" ""
+
+    # Don't generate windows cursors,
+    # they aren't used and aren't installed
+    # by the project's install script anyway.
+    echo "exit 0" > w32-make.sh
   '';
 
   nativeBuildInputs  = [
@@ -31,7 +36,9 @@ in stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     install -dm 0755 $out/share/icons
-    cp -pr Bibata_* $out/share/icons/
+    for x in Bibata_*; do
+      cp -pr $x/out/X11/$x $out/share/icons/
+    done
   '';
 
   meta = with stdenvNoCC.lib; {

From 2d826681e83392a91c8c05fe6bef36fa5518c8e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Jan 2020 17:23:57 -0600
Subject: [PATCH 069/755] bibata-extra-cursors: unstable-2018-10-28 -> 0.3,
 sync w/bibata-cursors

---
 pkgs/data/icons/bibata-cursors/extra.nix | 26 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix
index dc0ead649744..b9d4c22f878f 100644
--- a/pkgs/data/icons/bibata-cursors/extra.nix
+++ b/pkgs/data/icons/bibata-cursors/extra.nix
@@ -1,25 +1,33 @@
-{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
+{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
 
-stdenvNoCC.mkDerivation rec {
+let
+  py = python3.withPackages(ps: [ ps.pillow ]);
+in stdenvNoCC.mkDerivation rec {
   pname = "bibata-extra-cursors";
-  version = "unstable-2018-10-28";
-  
+  version = "0.3";
+
   src = fetchFromGitHub {
     owner = "KaizIqbal";
     repo = "Bibata_Extra_Cursor";
-    rev = "66fb64b8dbe830e3f7ba2c2bdc4dacae7c438789";
-    sha256 = "1xb7v06sbxbwzd7cnghv9c55lpbbkcaf1nswdrqy87gd0bnpdd2n";
+    rev = "v${version}";
+    sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk";
   };
 
   postPatch = ''
     patchShebangs .
-    substituteInPlace build.sh --replace "gksu " ""
+    substituteInPlace build.sh --replace "sudo" ""
+
+    # Don't generate windows cursors,
+    # they aren't used and aren't installed
+    # by the project's install script anyway.
+    echo "exit 0" > w32-make.sh
   '';
 
   nativeBuildInputs  = [
     gnome-themes-extra
     inkscape
     xcursorgen
+    py
   ];
 
   buildPhase = ''
@@ -28,7 +36,9 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     install -dm 0755 $out/share/icons
-    cp -pr Bibata_* $out/share/icons/
+    for x in Bibata_*; do
+      cp -pr $x/out/X11/$x $out/share/icons/
+    done
   '';
 
   meta = with stdenvNoCC.lib; {

From 905c707c16245221e6be553360a7dfe32325c567 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Jan 2020 09:02:53 -0600
Subject: [PATCH 070/755] sxiv: 25 -> 26, minor cleanup

---
 pkgs/applications/graphics/sxiv/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 99c151f8c80b..f54299583286 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -4,28 +4,24 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "sxiv";
-  version = "25";
+  version = "26";
 
   src = fetchFromGitHub {
     owner = "muennich";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp";
+    sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f";
   };
 
-  postUnpack = ''
-    substituteInPlace $sourceRoot/Makefile \
-      --replace /usr/local $out
-  '';
-
   configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
   buildInputs = [ libXft imlib2 giflib libexif ];
 
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
   postInstall = ''
-    mkdir -p $out/share/applications/
-    cp -v sxiv.desktop $out/share/applications/
+    install -Dt $out/share/applications sxiv.desktop
   '';
 
   meta = {

From afdfd68afa4cd4bfca9bc0a1e8a9bf8436a5b946 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 15 Jan 2020 11:01:18 -0600
Subject: [PATCH 071/755] lcdf-typetools: init at 2.108

---
 pkgs/tools/misc/lcdf-typetools/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/lcdf-typetools/default.nix

diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/tools/misc/lcdf-typetools/default.nix
new file mode 100644
index 000000000000..44f6768fd3bc
--- /dev/null
+++ b/pkgs/tools/misc/lcdf-typetools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "lcdf-typetools";
+  version = "2.108";
+
+  src = fetchFromGitHub {
+    owner = "kohler";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0a6jqaqwq43ldjjjlnsh6mczs2la9363qav7v9fyrfzkfj8kw9ad";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = [ "--without-kpathsea" ];
+
+  meta = with stdenv.lib; {
+    description = "Utilities for manipulating OpenType, PostScript Type 1, and Multiple Master fonts";
+    homepage = "https://www.lcdf.org/type";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c7afb8021a7..82bb62b887fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4691,6 +4691,8 @@ in
 
   latexrun = callPackage ../tools/typesetting/tex/latexrun { };
 
+  lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
+
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
   ldns = callPackage ../development/libraries/ldns { };

From ad115deaf50993e7061dadd89c0042e6f8094477 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 06:42:40 +0000
Subject: [PATCH 072/755] hpx: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 11b6df37fc0c..eafd85cc92aa 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hpx";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
     rev = version;
-    sha256 = "0yzxb8520qh9rvzsa190yzx21jn3d8rl8ac5v01767ygd0413hfk";
+    sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb";
   };
 
   buildInputs = [ boost hwloc gperftools ];

From 99929939b24a9c240b5819b1afaa9e3ec28c21c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 07:53:26 +0000
Subject: [PATCH 073/755] leatherman: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index b7b9b019b639..48735c13ed15 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
-    sha256 = "1aij0prpf7rvxx25qjf1krf0szb922hq9m6q58p90f5bjgymfzwh";
+    sha256 = "1kvvqvr0djz4gb770rs5h97zqcymvbzrmsw8kz2icvlmcicm7qd8";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 6508d14a23cefdbeca8b5a00666ffaf650b5070b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 07:59:59 +0000
Subject: [PATCH 074/755] libamqpcpp: 4.1.3 -> 4.1.5

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

diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 325a7d71598b..315d3f499560 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.1.3";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "0qk431ra7vcklc67fdaddrj5a7j50znjr79zrwvhkcfy82fd56zw";
+    sha256 = "1jyvpa68wymnn8wnh8i59pa9kdbixv86mh8q338agnwkmzvlgm58";
   };
 
   buildInputs = [ openssl ];

From ddaf7bf2c1b4acadf7edb63e3ea0cf7f8ac20207 Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Fri, 17 Jan 2020 09:14:52 +0100
Subject: [PATCH 075/755] facetimehd: unstable-2016-10-09 ->
 unstable-2019-12-10 for kernels > 4.8

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

diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index d65018c600ec..99e72c339832 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -16,9 +16,9 @@ let
   #       still works.
   srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
     { # Use mainline branch
-      version = "unstable-2016-10-09";
-      rev = "887d0f531ef7b91457be519474136c3355c5132b";
-      sha256 = "0bayahnxar1q6wvf9cb6p8gsfw98w0wqp715hs4r7apmddwk9v7n";
+      version = "unstable-2019-12-10";
+      rev = "ea832ac486afb6dac9ef59aa37e90f332ab7f05a";
+      sha256 = "1dg2i558hjnjnyk53xyg0ayykqaial9bm420v22s9a3khzzjnwq3";
     }
   else
     { # Use master branch (broken on 4.8)

From c841d2017ee88f363531df037b1209fde2e9c9fb Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 9 Jan 2020 05:00:15 -0800
Subject: [PATCH 076/755] v4l2loopback: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index ab1413efd801..275372b8309d 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "v4l2loopback";
     rev = "v${version}";
-    sha256 = "1bcypfz5nlfmdm2a00yl7rgl0jh0g2nmwndxlsrblqclznhjilg2";
+    sha256 = "01wahmrh4iw27cfmypik6frapq14vn7m9shmj5g7cr1apz2523aq";
   };
 
   hardeningDisable = [ "format" "pic" ];

From cf0640b982b457c0363a14de577a62ca3c04dcf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 08:23:36 +0000
Subject: [PATCH 077/755] luigi: 2.8.0 -> 2.8.11

---
 .../applications/networking/cluster/luigi/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index aad752643645..def13e2b9d06 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -2,19 +2,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "luigi";
-  version = "2.8.0";
+  version = "2.8.11";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1869lb6flmca6s7ccws7mvyn66nvrqjky40jwf2liv9fg0lp8899";
+    sha256 = "17nc5xrqp6hp3ayscvdpsiiga8gsfpa4whsk0n97gzk5qpndrcy2";
   };
 
-  # Relax version constraint
-  postPatch = ''
-    sed -i 's/<2.2.0//' setup.py
-  '';
-
-  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon boto3 ];
+  propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
 
   # Requires tox, hadoop, and google cloud
   doCheck = false;

From 6e0fc1f7727b0c6de49db853f63e0aad7bd0b647 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 08:32:02 +0000
Subject: [PATCH 078/755] magnetico: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix
index 1c266d247b7c..94720f35504b 100644
--- a/pkgs/applications/networking/p2p/magnetico/default.nix
+++ b/pkgs/applications/networking/p2p/magnetico/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "magnetico";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner  = "boramalper";
     repo   = "magnetico";
     rev    = "v${version}";
-    sha256 = "1f7y3z9ql079ix6ycihkmd3z3da3sfiqw2fap31pbvvjs65sg644";
+    sha256 = "1flw7r8igc0hhm288p67lpy9aj1fnywva5b28yfknpw8g97c9r5x";
   };
 
   modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf";

From a58a6de1b4e64edf7e4709ccb007ca1f4a2aad37 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 08:49:43 +0000
Subject: [PATCH 079/755] nix-bundle: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index cd90e50d70eb..b78b3bf07cd5 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-bundle";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0klabmygbhzlwxja8p2w8fp8ip3xaa5ym9c15rp9qxzh03hfmdjx";
+    sha256 = "084m9hqm1nhwln2sbg8ck2v2dprvpldxxqmd1r8fcj3dmn4bysz0";
   };
 
   # coreutils, gnutar is actually needed by nix for bootstrap

From 9e27f0510c288ce7c4ba6dc2dfab3b1d6e9d2abd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 08:52:48 +0000
Subject: [PATCH 080/755] notejot: 1.5.8 -> 1.6.0

---
 pkgs/applications/misc/notejot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index b91f8018c57c..1c02441474c0 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "1.5.8";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1v7f4xy5iwdjyf4416qpiwzifi68n466faia1hxzsq18fb1ri0af";
+    sha256 = "1b65m9gvq8ziqqgnw3vgjpjb1qw7bww40ngd3gardsjg9lcwpxaf";
   };
 
   nativeBuildInputs = [

From 702dd2573b1c7860995a1a294b443e959b447d0f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 09:52:29 +0000
Subject: [PATCH 081/755] pipreqs: 0.4.9 -> 0.4.10

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

diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix
index 15c5cbc0eb11..9925021b3f64 100644
--- a/pkgs/tools/misc/pipreqs/default.nix
+++ b/pkgs/tools/misc/pipreqs/default.nix
@@ -3,11 +3,11 @@
 # Using python 2 because when packaging with python 3 pipreqs fails to parse python 2 code.
 python2Packages.buildPythonApplication rec {
   pname = "pipreqs";
-  version = "0.4.9";
+  version = "0.4.10";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "cec6eecc4685967b27eb386037565a737d036045f525b9eb314631a68d60e4bc";
+    sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy";
   };
 
   propagatedBuildInputs = with python2Packages; [ yarg docopt ];

From a98253f848bee28f52cc48856086fe1b654831b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 10:22:22 +0000
Subject: [PATCH 082/755] rebar: 2.5.1 -> 2.6.4

---
 pkgs/development/tools/build-managers/rebar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 0b858f6f20d2..6178a7368fc5 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -2,7 +2,7 @@
 
 
 let
-  version = "2.5.1";
+  version = "2.6.4";
 in
 stdenv.mkDerivation {
   pname = "rebar";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
-    sha256 = "1y9b0smw0g5q197xf4iklzmcf8ad6w52p6mwzpf7b0ib1nd89jw6";
+    sha256 = "01xxq1f1vrwca00pky2van26hi2hhr05ghfhy71v5cifzax4cwjp";
   };
 
   buildInputs = [ erlang ];

From b103b008269ad6fe5d16f0d5a3c50d2ebe2a5f25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 10:34:59 +0000
Subject: [PATCH 083/755] scream-receivers: 3.3 -> 3.4

---
 pkgs/misc/scream-receivers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix
index 2ca00ccc9cea..79dc9350212c 100644
--- a/pkgs/misc/scream-receivers/default.nix
+++ b/pkgs/misc/scream-receivers/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "scream-receivers";
-  version = "3.3";
+  version = "3.4";
 
   src = fetchFromGitHub {
     owner = "duncanthrax";
     repo = "scream";
     rev = version;
-    sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w";
+    sha256 = "1ig89bmzfrm57nd8lamzsdz5z81ks5vjvq3f0xhgm2dk2mrgjsj3";
   };
 
   buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio;

From f8a5d63357c4e7b7e689672216931b62904ca5d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 10:41:53 +0000
Subject: [PATCH 084/755] sentencepiece: 0.1.84 -> 0.1.85

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

diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index 556f77ef8b51..907e0cc50760 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentencepiece";
-  version = "0.1.84";
+  version = "0.1.85";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "144y25nj4rwxmgvzqbr7al9fjwh3539ssjswvzrx4gsgfk62lsm0";
+    sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w";
   };
 
   enableParallelBuilding = true;

From d97a34cfcfc76fe0c2eca638166b93933e66b842 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 10:44:46 +0000
Subject: [PATCH 085/755] sewer: 0.7.0 -> 0.7.3

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

diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix
index 59edaff5f94e..c93aa987ece4 100644
--- a/pkgs/tools/admin/sewer/default.nix
+++ b/pkgs/tools/admin/sewer/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sewer";
-  version = "0.7.0";
+  version = "0.7.3";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "16j4npqj3fdj3g2z7nqb0cvvxd85xk20g9c43f3q8a1k5psf1fmq";
+    sha256 = "12z4xvblis4xcmm2zbq4dkhjx5lsmcxx80gik2g1pqd2809rxsmy";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ];

From 153934acfcc91eeed7cb75f83dcdb3ccb1d06063 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 11:03:57 +0000
Subject: [PATCH 086/755] snabb: 2018.01.2 -> 2019.11

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

diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index 9471efa92d75..caca1c829ec3 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "snabb";
-  version = "2018.01.2";
+  version = "2019.11";
 
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
     rev = "v${version}";
-    sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm";
+    sha256 = "1sas9d9kk92mc2wrwgmm0xxz7ycmh388dwvyxf1hy183yvin1nac";
   };
 
   buildInputs = [ makeWrapper ];

From bdf32f33fa159bc5852475abc2a117ce7f5f13c0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 17 Jan 2020 08:30:53 -0300
Subject: [PATCH 087/755] Notion custom license: exclude

---
 lib/licenses.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 986b7fa1fdd9..e2f94e565ce2 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -536,11 +536,6 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     fullName  = "University of Illinois/NCSA Open Source License";
   };
 
-  notion_lgpl = {
-    url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";
-    fullName = "Notion modified LGPL";
-  };
-
   nposl3 = spdx {
     spdxId = "NPOSL-3.0";
     fullName = "Non-Profit Open Software License 3.0";

From 74126d953c579ec9dea01d7badfdf8c5ca9344e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 11:44:05 +0000
Subject: [PATCH 088/755] todoist: 0.14.0 -> 0.15.0

---
 pkgs/applications/misc/todoist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index eaedad167489..74b2b770215c 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "todoist";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "todoist";
     rev = "v${version}";
-    sha256 = "0qhmv65il14lns817yxhma784jw5bz629svzh2ykrmilx5f7dxqc";
+    sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33";
   };
 
   modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";

From 842cca3d2f3676a496319e45a27fe4d1d96de76f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 11:54:21 +0000
Subject: [PATCH 089/755] tt-rss-theme-feedly: 2.0.0 -> 2.3.1

---
 pkgs/servers/tt-rss/theme-feedly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix
index c35667546c66..8ad511e5b5b8 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/pkgs/servers/tt-rss/theme-feedly/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
   pname = "tt-rss-theme-feedly";
-  version = "2.0.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "levito";
     repo = "tt-rss-feedly-theme";
     rev = "v${version}";
-    sha256 = "024hngwzfdgw5jqppc8vh75jidfqghaccy969hvbhxhgk6j6l8m4";
+    sha256 = "0rl5g664grx3m7yxa14rgnbvnlc3xnn44kzjji5layxww6jd8h2s";
   };
 
   dontBuild = true;

From 354bcfeab01b283c2fe75d20ca0a584d82030d4d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:08:42 +0000
Subject: [PATCH 090/755] video2midi: 0.3.9.6 -> 0.4.0.1

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

diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix
index 43539f1ee295..dca8a0610da8 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/pkgs/tools/audio/video2midi/default.nix
@@ -8,7 +8,7 @@ let
   });
 in pythonPackages.buildPythonApplication rec {
   pname = "video2midi";
-  version = "0.3.9.6";
+  version = "0.4.0.1";
 
   format = "other";
 
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "svsdval";
     repo = pname;
     rev = version;
-    sha256 = "0x9b8hwl325gd6v9i60yh95gbn49nydpwyfqs92mbq8vvvq7x8fk";
+    sha256 = "1869w60kprjdikqk4iwx058zri2jg4aznzlg668w9myka4mp01r9";
   };
 
   propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ];

From 709f5058982b4169d0e0ac1db60ceff3efaae524 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:17:54 +0000
Subject: [PATCH 091/755] vkquake: 1.03.0 -> 1.04.1

---
 pkgs/games/quakespasm/vulkan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index e30065666b0f..deca3bec9cc7 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vkquake";
-  version = "1.03.0";
+  version = "1.04.1";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     rev = version;
-    sha256 = "1x2lx1fvr2p91clbx2jcc29j5yyh0xwq9fh0lyxhyadf5a710fn0";
+    sha256 = "1ry861pk3z02hy7i0yi3xwmd1zma802qzcnlm09w6pslayd9rwbf";
   };
 
   sourceRoot = "source/Quake";

From 9584607d52b5ca0237b297920c747fc71027ca68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:23:54 +0000
Subject: [PATCH 092/755] wakatime: 13.0.2 -> 13.0.3

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index a685dc7cbdee..58ad9182261b 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "wakatime";
-  version = "13.0.2";
+  version = "13.0.3";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime";
     rev = version;
-    sha256 = "0ng7hb83gj6vb569qh58vqp4ana162r20dif086kgc3sch2z63j9";
+    sha256 = "16g23nm1x1a142rmnljdclq03c5anfzyiiazxaxyka8bggzhfmmc";
   };
 
   # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt

From 34cec3101587c6dce440ba89ea20cc55fc7a4e7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:26:58 +0000
Subject: [PATCH 093/755] wavemon: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index fefff8573816..89177f49ecfc 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.0";
+  version = "0.9.1";
   baseName = "wavemon";
   name = "${baseName}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "uoaerg";
     repo = "wavemon";
     rev = "v${version}";
-    sha256 = "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6";
+    sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg";
   };
 
   meta = with stdenv.lib; {

From 839cf84c4133f6146363f0f643e73efed2ecb2f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:33:55 +0000
Subject: [PATCH 094/755] xmrig: 5.4.0 -> 5.5.1

---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index b1bf98704c58..2f4c78281347 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "5.4.0";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1rwnlhzhasfa2iklrp897c0z7nvav2bz2z6nk41fvwwd3bsay2sf";
+    sha256 = "0b9wfv56s5696q493hid2ikaa0ycgkx35pyyvxsdrcf94rbxyd1x";
   };
 
   nativeBuildInputs = [ cmake ];

From f9bf683062b8cdda7b2390587e3bc74f8c18b974 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:37:14 +0000
Subject: [PATCH 095/755] xsecurelock: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 8349953f4ff1..548101c34c3c 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xsecurelock";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
     rev = "v${version}";
-    sha256 = "0zdwszscdw0p7kwpqqv1dywn00bq1wak2x602lb6hdmkffspi8bg";
+    sha256 = "020y2mi4sshc5dghcz37aj5wwizbg6712rzq2a72f8z8m7mnxr5y";
   };
 
   nativeBuildInputs = [

From 944d340c1e0f63450991fd8f95d28842886d72e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 17 Jan 2020 12:44:07 +0000
Subject: [PATCH 096/755] zfs-replicate: 1.1.11 -> 1.1.14

---
 pkgs/tools/backup/zfs-replicate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix
index 83fa76b0800e..1cb7e6474412 100644
--- a/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/pkgs/tools/backup/zfs-replicate/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonApplication rec {
   pname = "zfs-replicate";
-  version = "1.1.11";
+  version = "1.1.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8";
+    sha256 = "0iqyk6q112ylcqrhrgvgbgqqvaikhwk0sb5kc7kg2wwqdc9rfwys";
   };
 
   checkInputs = [

From 5c0b9f565143e27254bbff46dc193645a94ded9b Mon Sep 17 00:00:00 2001
From: leotaku <leo.gaskin@brg-feldkirchen.at>
Date: Fri, 17 Jan 2020 16:07:05 +0100
Subject: [PATCH 097/755] cbatticon: Add wrapGAppsHook to nativeBuildInputs

---
 pkgs/applications/misc/cbatticon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index d6680c61eb9b..ac2948c2d6ef 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify }:
+{ stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "cbatticon";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr";
   };
 
-  nativeBuildInputs = [ pkgconfig gettext ];
+  nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
 
   buildInputs =  [ glib gtk3 libnotify ];
 

From 5da89034f9f6b0ea29696a3336e095e2e8e04b57 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Jan 2020 12:51:57 -0600
Subject: [PATCH 098/755] teeworlds: cmake instead of bam, oh joy! cleanup

---
 pkgs/games/teeworlds/default.nix | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index ceb908099045..9e85714940c2 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, bam, pkgconfig, python, alsaLib
+{ fetchFromGitHub, stdenv, cmake, pkgconfig, python, alsaLib
 , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
 }:
 
@@ -21,35 +21,12 @@ stdenv.mkDerivation rec {
                 '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
   '';
 
-  nativeBuildInputs = [ bam pkgconfig ];
-
-  configurePhase = ''
-    runHook preConfigure
-    bam config
-    runHook postConfigure
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    bam conf=release
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/teeworlds
-    cp build/x86_64/release/teeworlds{,_srv} $out/bin
-    cp -r build/x86_64/release/data $out/share/teeworlds
-  '';
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
     python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
   ];
 
-  postInstall = ''
-    mkdir -p $out/share/doc/teeworlds
-    cp -v *.txt $out/share/doc/teeworlds/
-  '';
-
   meta = {
     description = "Retro multiplayer shooter game";
 

From 7d67db39199130aa75bb3315e991830e2a988258 Mon Sep 17 00:00:00 2001
From: Jacquin Mininger <jacquin.mininger@gmail.com>
Date: Mon, 23 Dec 2019 15:33:18 -0500
Subject: [PATCH 099/755] shellFor: Refactor for consistency and cross

This makes it work like work-on-multi from Reflex Platform. In
particular, rather than making `.env` from `shellFor`, we make `.env`
the primitive, and `shellFor` works by combining together the arguments
of all the packages to `generic-builder` and taking the `.env` of the
resulting mashup-package.

There are 2 benefits of this:

1. The dependency logic is deduplicated. generic builder just concatted
   lists, whereas all the envs until now would sieve apart haskell and
   system build inputs. Now, they both decide haskell vs system the same
   way: according to the argument list and without reflection.
   Consistency is good, especially because it mean that if the build
   works, the shell is more likely to work.

2. Cross is handled better. For native builds, because the
   `ghcWithPackages` calls would shadow, we through both the regular
   component (lib, exe, test, bench) haskell deps and Setup.hs haskell
   deps in the same `ghcWithPackages` call. But for cross builds we use
   `buildPackages.ghcWithPackages` to get the setup deps. This ensures
   everything works correctly.
---
 .../haskell-modules/generic-builder.nix       | 148 +++++++++++++++---
 .../haskell-modules/make-package-set.nix      |  70 ++++-----
 pkgs/test/default.nix                         |   2 +
 pkgs/test/haskell-shellFor/default.nix        |  24 +++
 4 files changed, 186 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/test/haskell-shellFor/default.nix

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 018979cf7aed..e2ac61a1416e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPackages, buildHaskellPackages, ghc
-, jailbreak-cabal, hscolour, cpphs, nodejs, shellFor
+, jailbreak-cabal, hscolour, cpphs, nodejs
+, ghcWithHoogle, ghcWithPackages
 }:
 
 let
@@ -205,21 +206,28 @@ let
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
   depsBuildBuild = [ nativeGhc ];
-  nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
-                      setupHaskellDepends ++
-                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
-                      optionals doCheck testToolDepends ++
-                      optionals doBenchmark benchmarkToolDepends;
+  collectedToolDepends =
+    buildTools ++ libraryToolDepends ++ executableToolDepends ++
+    optionals doCheck testToolDepends ++
+    optionals doBenchmark benchmarkToolDepends;
+  nativeBuildInputs =
+    [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+    setupHaskellDepends ++ collectedToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
-                     allPkgconfigDepends ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
-                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
-
-
-  allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs;
-  isHaskellPartition =
-    stdenv.lib.partition isHaskellPkg allBuildInputs;
+  otherBuildInputsHaskell =
+    optionals doCheck (testDepends ++ testHaskellDepends) ++
+    optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends);
+  otherBuildInputsSystem =
+    extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
+    allPkgconfigDepends ++
+    optionals doCheck (testSystemDepends ++ testFrameworkDepends) ++
+    optionals doBenchmark (benchmarkSystemDepends ++ benchmarkFrameworkDepends);
+  # TODO next rebuild just define as `otherBuildInputsHaskell ++ otherBuildInputsSystem`
+  otherBuildInputs =
+    extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
+    allPkgconfigDepends ++
+    optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
+    optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
 
   setupCommand = "./Setup";
 
@@ -460,17 +468,61 @@ stdenv.mkDerivation ({
     runHook postInstall
   '';
 
-  passthru = passthru // {
+  passthru = passthru // rec {
 
     inherit pname version;
 
     compiler = ghc;
 
+    # All this information is intended just for `shellFor`.  It should be
+    # considered unstable and indeed we knew how to keep it private we would.
+    getCabalDeps = {
+      inherit
+        buildDepends
+        buildTools
+        executableFrameworkDepends
+        executableHaskellDepends
+        executablePkgconfigDepends
+        executableSystemDepends
+        executableToolDepends
+        extraLibraries
+        libraryFrameworkDepends
+        libraryHaskellDepends
+        libraryPkgconfigDepends
+        librarySystemDepends
+        libraryToolDepends
+        pkgconfigDepends
+        setupHaskellDepends
+        ;
+    } // stdenv.lib.optionalAttrs doCheck {
+      inherit
+        testDepends
+        testFrameworkDepends
+        testHaskellDepends
+        testPkgconfigDepends
+        testSystemDepends
+        testToolDepends
+        ;
+    } // stdenv.lib.optionalAttrs doBenchmark {
+      inherit
+        benchmarkDepends
+        benchmarkFrameworkDepends
+        benchmarkHaskellDepends
+        benchmarkPkgconfigDepends
+        benchmarkSystemDepends
+        benchmarkToolDepends
+        ;
+    };
 
-    getBuildInputs = {
+    # Attributes for the old definition of `shellFor`. Should be removed but
+    # this predates the warning at the top of `getCabalDeps`.
+    getBuildInputs = rec {
       inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
       haskellBuildInputs = isHaskellPartition.right;
       systemBuildInputs = isHaskellPartition.wrong;
+      isHaskellPartition = stdenv.lib.partition
+        isHaskellPkg
+        (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs);
     };
 
     isHaskellLibrary = isLibrary;
@@ -483,10 +535,64 @@ stdenv.mkDerivation ({
     # TODO: fetch the self from the fixpoint instead
     haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
 
-    env = shellFor {
-      packages = p: [ drv ];
-      inherit shellHook;
-    };
+    # Creates a derivation containing all of the necessary dependencies for building the
+    # parent derivation. The attribute set that it takes as input can be viewed as:
+    #
+    #    { withHoogle }
+    #
+    # The derivation that it builds contains no outpaths because it is meant for use
+    # as an environment
+    #
+    #   # Example use
+    #   # Creates a shell with all of the dependencies required to build the "hello" package,
+    #   # and with python:
+    #
+    #   > nix-shell -E 'with (import <nixpkgs> {}); \
+    #   >    haskell.packages.ghc865.hello.envFunc { buildInputs = [ python ]; }'
+    envFunc = { withHoogle ? false }:
+      let
+        name = "ghc-shell-for-${drv.name}";
+
+        withPackages = if withHoogle then ghcWithHoogle else ghcWithPackages;
+
+        # We use the `ghcWithPackages` function from `buildHaskellPackages` if we
+        # want a shell for the sake of cross compiling a package. In the native case
+        # we don't use this at all, and instead put the setupDepends in the main
+        # `ghcWithPackages`. This way we don't have two wrapper scripts called `ghc`
+        # shadowing each other on the PATH.
+        ghcEnvForBuild =
+          assert isCross;
+          buildHaskellPackages.ghcWithPackages (_: setupHaskellDepends);
+
+        ghcEnv = withPackages (_:
+          otherBuildInputsHaskell ++
+          propagatedBuildInputs ++
+          stdenv.lib.optionals (!isCross) setupHaskellDepends);
+
+        ghcCommandCaps = stdenv.lib.toUpper ghcCommand';
+      in stdenv.mkDerivation ({
+        inherit name shellHook;
+
+        depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
+        nativeBuildInputs =
+          [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+          collectedToolDepends;
+        buildInputs =
+          otherBuildInputsSystem;
+        phases = ["installPhase"];
+        installPhase = "echo $nativeBuildInputs $buildInputs > $out";
+        LANG = "en_US.UTF-8";
+        LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+        "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+        "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+        # TODO: is this still valid?
+        "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+        "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
+          then "${ghcEnv}/lib/HaLVM-${ghc.version}"
+          else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
+      });
+
+    env = envFunc { };
 
   };
 
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index a4c040673487..d23df0df3171 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -38,12 +38,12 @@ let
   inherit (stdenv) buildPlatform hostPlatform;
 
   inherit (stdenv.lib) fix' extends makeOverridable;
-  inherit (haskellLib) overrideCabal getBuildInputs;
+  inherit (haskellLib) overrideCabal;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
     inherit stdenv;
     nodejs = buildPackages.nodejs-slim;
-    inherit (self) buildHaskellPackages ghc shellFor;
+    inherit (self) buildHaskellPackages ghc ghcWithHoogle ghcWithPackages;
     inherit (self.buildHaskellPackages) jailbreak-cabal;
     hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: {
       isLibrary = false;
@@ -255,6 +255,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # packages themselves. Using nix-shell on this derivation will
     # give you an environment suitable for developing the listed
     # packages with an incremental tool like cabal-install.
+    # In addition to the "packages" arg and "withHoogle" arg, anything that
+    # can be passed into stdenv.mkDerivation can be included in the input attrset
     #
     #     # default.nix
     #     with import <nixpkgs> {};
@@ -265,9 +267,11 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #     })
     #
     #     # shell.nix
+    #     let pkgs = import <nixpkgs> {} in
     #     (import ./.).shellFor {
     #       packages = p: [p.frontend p.backend p.common];
     #       withHoogle = true;
+    #       buildInputs = [ pkgs.python ];
     #     }
     #
     #     -- cabal.project
@@ -277,49 +281,41 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #       common/
     #
     #     bash$ nix-shell --run "cabal new-build all"
+    #     bash$ nix-shell --run "python"
     shellFor = { packages, withHoogle ? false, ... } @ args:
       let
-        selected = packages self;
+        combinedPackageFor = packages:
+          let
+            selected = packages self;
 
-        packageInputs = map getBuildInputs selected;
+            pname = if pkgs.lib.length selected == 1
+              then (pkgs.lib.head selected).name
+              else "packages";
 
-        name = if pkgs.lib.length selected == 1
-          then "ghc-shell-for-${(pkgs.lib.head selected).name}"
-          else "ghc-shell-for-packages";
+            # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
+            # because cabal will end up ignoring that built version, assuming
+            # new-style commands.
+            combinedPackages = pkgs.lib.filter
+              (input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected);
 
-        # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
-        # because cabal will end up ignoring that built version, assuming
-        # new-style commands.
-        haskellInputs = pkgs.lib.filter
-          (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
-          (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
-        systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;
+            # Returns an attrset containing a combined list packages' inputs for each
+            # stage of the build process
+            packageInputs = pkgs.lib.zipAttrsWith
+              (_: pkgs.lib.concatMap combinedPackages)
+              (map (p: p.getCabalDeps) selected);
 
-        withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages;
-        ghcEnv = withPackages (p: haskellInputs);
-        nativeBuildInputs = pkgs.lib.concatMap (p: p.nativeBuildInputs) selected;
+            genericBuilderArgs = {
+              inherit pname;
+              version = "0";
+              license = null;
+            } // packageInputs;
 
-        ghcCommand' = if ghc.isGhcjs or false then "ghcjs" else "ghc";
-        ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
-        ghcCommandCaps= pkgs.lib.toUpper ghcCommand';
+          in self.mkDerivation genericBuilderArgs;
 
-        mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
-      in pkgs.stdenv.mkDerivation (mkDrvArgs // {
-        name = mkDrvArgs.name or name;
-
-        buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
-        nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs ++ mkDrvArgs.nativeBuildInputs or [];
-        phases = ["installPhase"];
-        installPhase = "echo $nativeBuildInputs $buildInputs > $out";
-        LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = pkgs.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
-        "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
-        "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
-        # TODO: is this still valid?
-        "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
-        "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
-          then "${ghcEnv}/lib/HaLVM-${ghc.version}"
-          else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
+        envFuncArgs = builtins.removeAttrs args [ "packages" ];
+      in (combinedPackageFor packages).env.overrideAttrs (old: envFuncArgs // {
+        nativeBuildInputs = old.nativeBuildInputs ++ envFuncArgs.nativeBuildInputs or [];
+        buildInputs = old.buildInputs ++ envFuncArgs.buildInputs or [];
       });
 
     ghc = ghc // {
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 793229f8bbb0..da7e8a816cdb 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -22,6 +22,8 @@ with pkgs;
   cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; };
   stdenv-inputs = callPackage ./stdenv-inputs { };
 
+  haskell-shellFor = callPackage ./haskell-shellFor { };
+
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
 
diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix
new file mode 100644
index 000000000000..1b3de999d228
--- /dev/null
+++ b/pkgs/test/haskell-shellFor/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, haskellPackages, cabal-install }:
+
+haskellPackages.shellFor {
+  packages = p: [ p.database-id-class p.constraints-extras ];
+  nativeBuildInputs = [ cabal-install ];
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+  unpackPhase = ''
+    sourceRoot=$(pwd)/scratch
+    mkdir -p "$sourceRoot"
+    cd "$sourceRoot"
+    tar -xf ${haskellPackages.database-id-class.src}
+    tar -xf ${haskellPackages.constraints-extras.src}
+    cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints-extras*"} cabal.project
+  '';
+  buildPhase = ''
+    export HOME=$(mktemp -d)
+    mkdir -p $HOME/.cabal
+    touch $HOME/.cabal/config
+    cabal v2-build --offline --verbose database-id-class constraints-extras --ghc-options="-O0 -j$NIX_BUILD_CORES"
+  '';
+  installPhase = ''
+    touch $out
+  '';
+}

From cb46b97ae93b0c26af5ab65ee7f2f9b291027f43 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 17 Jan 2020 10:48:42 -0500
Subject: [PATCH 100/755] release.nix: Make hydra build all unit tests

We have just a few, and these are regular jobs not must-pass. The tests
that were must-pass are left as is.
---
 pkgs/top-level/release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index da81a696337d..17091b17e89e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -190,6 +190,8 @@ let
       haskellPackages = packagePlatforms pkgs.haskellPackages;
       idrisPackages = packagePlatforms pkgs.idrisPackages;
 
+      tests = packagePlatforms pkgs.tests;
+
       # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
       #emacsPackages = packagePlatforms pkgs.emacsPackages;

From 26afc6c46d4af99f545a6d7301bcfa439b41edea Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 17 Jan 2020 17:42:33 +0100
Subject: [PATCH 101/755] fish: fix systemctl completion

---
 pkgs/shells/fish/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 1ef3c4b6fd9a..5f59c33af0d1 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -3,6 +3,7 @@
   groff, man-db, getent, libiconv, pcre2,
   gettext, ncurses, python3,
   cmake
+  , fetchpatch
 
   , writeText
 
@@ -107,6 +108,15 @@ let
       patchShebangs ./build_tools/git_version_gen.sh
     '';
 
+    patches = [
+      # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion.
+      # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0)
+      (fetchpatch {
+        url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch";
+        sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw";
+      })
+    ];
+
     # Required binaries during execution
     # Python: Autocompletion generated from manpages and config editing
     propagatedBuildInputs = [

From c154dd5101c816f66d4c6e992d8f9a667e7e45c4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 16:03:00 +0100
Subject: [PATCH 102/755] nixos/buildkite-agent: stop deploying public keys,
 make ssh private key optional.

SSH public keys aren't needed to clone private repos, and if we only
need to configure a single attribute, there's no need for the "openssh"
attrset anymore.
---
 .../buildkite-agent.nix                       | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index e996680bedaf..49fa4271caca 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -93,26 +93,19 @@ in
         '';
       };
 
-      openssh =
-        { privateKeyPath = mkOption {
-            type = types.path;
-            description = ''
-              Private agent key.
+      privateSshKeyPath = mkOption {
+        type = types.path;
+        ## maximum care is taken so that secrets (ssh keys and the CI token)
+        ## don't end up in the Nix store.
+        apply = final: if final == null then null else toString final;
 
-              A run-time path to the key file, which is supposed to be provisioned
-              outside of Nix store.
-            '';
-          };
-          publicKeyPath = mkOption {
-            type = types.path;
-            description = ''
-              Public agent key.
+        description = ''
+          OpenSSH private key
 
-              A run-time path to the key file, which is supposed to be provisioned
-              outside of Nix store.
-            '';
-          };
-        };
+          A run-time path to the key file, which is supposed to be provisioned
+          outside of Nix store.
+        '';
+      };
 
       hooks = mkHookOptions [
         { name = "checkout";
@@ -217,7 +210,6 @@ in
           ''
             mkdir -m 0700 -p "${sshDir}"
             cp -f "${toString cfg.openssh.privateKeyPath}" "${sshDir}/id_rsa"
-            cp -f "${toString cfg.openssh.publicKeyPath}"  "${sshDir}/id_rsa.pub"
             chmod 600 "${sshDir}"/id_rsa*
 
             cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
@@ -249,8 +241,10 @@ in
     ];
   };
   imports = [
-    (mkRenamedOptionModule [ "services" "buildkite-agent" "token" ]                [ "services" "buildkite-agent" "tokenPath" ])
-    (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKey" ] [ "services" "buildkite-agent" "openssh" "privateKeyPath" ])
-    (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ]  [ "services" "buildkite-agent" "openssh" "publicKeyPath" ])
+    (mkRenamedOptionModule [ "services" "buildkite-agent" "token" ]                    [ "services" "buildkite-agent" "tokenPath" ])
+    (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKey" ]     [ "services" "buildkite-agent" "privateSshKeyPath" ])
+    (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKeyPath" ] [ "services" "buildkite-agent" "privateSshKeyPath" ])
+    (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ]      "SSH public keys aren't necessary to clone private repos.")
+    (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKeyPath" ]  "SSH public keys aren't necessary to clone private repos.")
   ];
 }

From 92377672770532ff5642e9d5e4b639db2357c053 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 16:28:31 +0100
Subject: [PATCH 103/755] nixos/buildkite-agent: actually use
 services.buildkite-agent.package

We were currently just using pkgs.buildkite-agent, no matter what was
configured in services.buildkite-agent.package
---
 .../modules/services/continuous-integration/buildkite-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 49fa4271caca..ca31865b9c29 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -223,7 +223,7 @@ in
           '';
 
         serviceConfig =
-          { ExecStart = "${cfg.buildkite-agent}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
+          { ExecStart = "${cfg.package}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
             User = "buildkite-agent";
             RestartSec = 5;
             Restart = "on-failure";

From 99d0f4c38064841dcc3a188667099e491ebc9932 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 16:47:34 +0100
Subject: [PATCH 104/755] nixos/buildkite-agent: tweak TimeoutStopSec and
 KillMode

This improves behaviour when the service is being stopped.
---
 .../services/continuous-integration/buildkite-agent.nix        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index ca31865b9c29..3da1e5e79e21 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -228,6 +228,9 @@ in
             RestartSec = 5;
             Restart = "on-failure";
             TimeoutSec = 10;
+            # set a long timeout to give buildkite-agent a chance to finish current builds
+            TimeoutStopSec = "2 min";
+            KillMode = "mixed";
           };
       };
 

From 8f19d7211313df46c30ab8b0748a6924e00c6874 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Wed, 26 Sep 2018 19:57:32 +0200
Subject: [PATCH 105/755] buildkite-agent2: remove package

The latest 2.x release was in Jan 2018.
---
 .../buildkite-agent/2.x.nix                   | 12 -----
 .../buildkite-agent/3.x.nix                   | 15 ------
 .../buildkite-agent/default.nix               | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +--
 4 files changed, 51 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
 delete mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
 create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/default.nix

diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
deleted file mode 100644
index 6a73e2581822..000000000000
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  src = fetchFromGitHub {
-    owner = "buildkite";
-    repo = "agent";
-    rev = "v${version}";
-    sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg";
-  };
-  version = "2.6.10";
-  hasBootstrapScript = true;
-})
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
deleted file mode 100644
index f4dd4de93b2d..000000000000
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ bash, callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  src = fetchFromGitHub {
-    owner = "buildkite";
-    repo = "agent";
-    rev = "v${version}";
-    sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
-  };
-  version = "3.17.0";
-  hasBootstrapScript = false;
-  postPatch = ''
-    substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
-  '';
-})
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
new file mode 100644
index 000000000000..7e86c93b9bd6
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -0,0 +1,48 @@
+{ fetchFromGitHub, stdenv, buildGoPackage,
+  makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
+buildGoPackage rec {
+  name = "buildkite-agent-${version}";
+  version = "3.17.0";
+
+  goPackagePath = "github.com/buildkite/agent";
+
+  src = fetchFromGitHub {
+    owner = "buildkite";
+    repo = "agent";
+    rev = "v${version}";
+    sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
+  };
+  postPatch = ''
+    substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # on Linux, the TMPDIR is /build which is the same prefix as this package
+  # remove once #35068 is merged
+  noAuditTmpdir = stdenv.isLinux;
+
+  postInstall = ''
+    # Fix binary name
+    mv $bin/bin/{agent,buildkite-agent}
+
+    # These are runtime dependencies
+    wrapProgram $bin/bin/buildkite-agent \
+      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Build runner for buildkite.com";
+    longDescription = ''
+      The buildkite-agent is a small, reliable, and cross-platform build runner
+      that makes it easy to run automated builds on your own infrastructure.
+      It’s main responsibilities are polling buildkite.com for work, running
+      build jobs, reporting back the status code and output log of the job,
+      and uploading the job's artifacts.
+    '';
+    homepage = https://buildkite.com/docs/agent;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a748894887fe..55005036c262 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9768,9 +9768,9 @@ in
 
   buck = callPackage ../development/tools/build-managers/buck { };
 
-  buildkite-agent = buildkite-agent2;
-  buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { };
-  buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { };
+  buildkite-agent = buildkite-agent3;
+  buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
+  buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { };
 
   libbpf = callPackage ../os-specific/linux/libbpf { };
 

From e1ad9d16857d53aab8762249af7bd566856ed81a Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 6 Sep 2018 14:02:55 +0200
Subject: [PATCH 106/755] nixos/buildkite-agent: add a shell attribute to
 specify the shell being used

This gets passed to BUILDKITE_SHELL, which will specify the shell being
used to executes script in.

Defaults to `${pkgs.bash}/bin/bash -e -c`, matching how buildkite
behaves on other distros.
---
 .../services/continuous-integration/buildkite-agent.nix  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 3da1e5e79e21..00b881ffe3c2 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -174,6 +174,14 @@ in
           instead.
         '';
       };
+
+      shell = mkOption {
+        type = types.str;
+        default = "${pkgs.bash}/bin/bash -e -c";
+        description = ''
+          Command that buildkite-agent 3 will execute when it spawns a shell.
+        '';
+      };
     };
   };
 
@@ -216,6 +224,7 @@ in
             token="$(cat ${toString cfg.tokenPath})"
             name="${cfg.name}"
             ${metaData}
+            shell="${cfg.shell}"
             build-path="${cfg.dataDir}/builds"
             hooks-path="${cfg.hooksPath}"
             ${cfg.extraConfig}

From 4b20959f9980665d1024d9b3bb8da43a6f9f8fa4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 17 Jan 2020 13:51:57 -0500
Subject: [PATCH 107/755] skanlite: use qt5's mkDerivaiton

---
 pkgs/applications/office/skanlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix
index 416c86397f86..e5fd4ce1bd1e 100644
--- a/pkgs/applications/office/skanlite/default.nix
+++ b/pkgs/applications/office/skanlite/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase,
+{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
   kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
   libksane
 }:
 
 let
   minorVersion = "2.0";
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "skanlite-2.0.1";
 
   src = fetchurl {

From ac96ba02701c2c5163075d2d0d2270ba39ef0e2b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 17 Jan 2020 13:52:24 -0500
Subject: [PATCH 108/755] skanlite: don't set enableParallelBuilding

it's default on
---
 pkgs/applications/office/skanlite/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix
index e5fd4ce1bd1e..d4c1df75709b 100644
--- a/pkgs/applications/office/skanlite/default.nix
+++ b/pkgs/applications/office/skanlite/default.nix
@@ -21,8 +21,6 @@ in mkDerivation rec {
     libksane
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "KDE simple image scanning application";
     homepage    = http://www.kde.org/applications/graphics/skanlite/;

From b01e3973997608786105bf2e7de904ee7c3782bb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Jan 2020 19:44:54 +0100
Subject: [PATCH 109/755] mautrix-whatsapp: 2020-01-07 -> 2020-01-12

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

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index f497ba97e70d..bb72ce1b45fd 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
-  version = "2020-01-07";
+  version = "2020-01-12";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "mautrix-whatsapp";
-    rev = "302fae6649f083ae2a1d4431157e6045865f62ad";
-    sha256 = "0rnlbw1xqk9kjc23pmybxdznxylpfxl35wa37lkafymfardjjavb";
+    rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e";
+    sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl";
   };
 
   modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik";

From 4c58a2d2c7e850fbde1fd21d26ecb34e9d9edc0f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Jan 2020 20:14:19 +0100
Subject: [PATCH 110/755] cargo-make: 0.26.0 -> 0.26.1

https://github.com/sagiegurari/cargo-make/releases/tag/0.26.1
---
 .../tools/rust/cargo-make/Cargo.lock          | 199 +++++++++++++-----
 .../tools/rust/cargo-make/default.nix         |   6 +-
 2 files changed, 152 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index 5d3392fcc382..bcf708735f62 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -5,7 +5,7 @@ name = "aho-corasick"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -36,11 +36,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "autocfg"
 version = "1.0.0"
@@ -48,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "backtrace"
-version = "0.3.40"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -86,7 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -104,29 +99,29 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "colored 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscriptsdk 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "run_script 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -181,7 +176,7 @@ dependencies = [
 
 [[package]]
 name = "colored"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -191,7 +186,7 @@ dependencies = [
 
 [[package]]
 name = "constant_time_eq"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -225,28 +220,87 @@ dependencies = [
 
 [[package]]
 name = "duckscript"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "duckscriptsdk"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "duckscript 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-japanese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-korean"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-simpchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-singlebyte"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-tradchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding_index_tests"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "envmnt"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -254,7 +308,7 @@ name = "failure"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -263,7 +317,7 @@ name = "failure_derive"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -341,13 +395,22 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "java-properties"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -373,7 +436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "memchr"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -414,7 +477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -425,12 +488,12 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -521,9 +584,9 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -536,7 +599,7 @@ name = "run_script"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -560,6 +623,14 @@ name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -583,7 +654,7 @@ name = "serde_derive"
 version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -606,7 +677,7 @@ name = "syn"
 version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -616,7 +687,7 @@ name = "synstructure"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -632,7 +703,7 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -650,7 +721,7 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -679,6 +750,16 @@ name = "vec_map"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "walkdir"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
@@ -698,6 +779,14 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -709,9 +798,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
+"checksum backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b4b1549d804b6c73f4817df2ba073709e96e426f12987127c48e6745568c350b"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
@@ -724,13 +812,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum colored 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f930f8b286023ed451756fe2527d73484d667adf9e905e9932e81d52996a343a"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum duckscript 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa0a0d525a182f41071f23b8912111e2ef42bab6ceb29794ae253977788b0c0"
-"checksum duckscriptsdk 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "79681ce8de938dfa0af2b38cae1a7fc5e341eac8acadea3578d1c07c3e6b8f29"
+"checksum duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b5394d82936cc15539317618b25d532c7fc36415eb8c1ca4c3fd263c104e6145"
+"checksum duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3053a419a5bf69b015c8a9d42d82f2fffdf106f9353384d9f5c1819b68dc6141"
+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "39cdd9fdbf10b8cfa59dd70ef823cbaa83e33b86f4ad291ae67b16f4bd37bc69"
 "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
 "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
@@ -744,20 +839,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
 "checksum hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01b1af8d6d068ba9de1c39c6ff0d879aed20f74873d4d3929a4535000bb07886"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
+"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
+"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
 "checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
 "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
 "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
@@ -773,6 +869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
 "checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
@@ -782,14 +879,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88ddf1ad580c7e3d1efff877d972bcc93f995556b9087a5a259630985c88ceab"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 25d700d0445b..bbad7ee731bd 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src =
     let
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "0x17slfih65hj7xc3m847792yhlkpzq2lnbxgc2kwciclyzhjgfd";
+        sha256 = "04h8vr8k790kkn09yrqv7py0sn2fmj4b51c4kjhplr0pcxkbdbdn";
       };
     in
     runCommand "cargo-make-src" {} ''
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1p20y6a99f5bjmjkwq7jvgmvhg6klkacybq4bc4xq6135qnqhdv8";
+  cargoSha256 = "05m966h58mgq1bm92yfzzpd4ivlv4jh5fy1kfazcfsfw2k0kqmka";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 7fa8332907c83282adb45384b38ffcf0e6fa8da4 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Fri, 17 Jan 2020 14:54:22 +0100
Subject: [PATCH 111/755] dotnetCorePackages: Add function to combine SDK
 packages

Fixup assert


Fixup: Move comment to top


Fixup combine


Fixup combine


Fixup buildDotnet


Fixup default.nix


Fixup combine packages


dotnetCorePackages: Fixup combinePackages

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 .../compilers/dotnet/buildDotnet.nix          | 66 +++++++++++++++++++
 .../compilers/dotnet/combinePackages.nix      | 20 ++++++
 pkgs/development/compilers/dotnet/default.nix | 18 +++++
 .../compilers/dotnet/sdk/default.nix          | 54 ---------------
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 107 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/development/compilers/dotnet/buildDotnet.nix
 create mode 100644 pkgs/development/compilers/dotnet/combinePackages.nix
 create mode 100644 pkgs/development/compilers/dotnet/default.nix
 delete mode 100644 pkgs/development/compilers/dotnet/sdk/default.nix

diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix
new file mode 100644
index 000000000000..0c2222c4c83d
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/buildDotnet.nix
@@ -0,0 +1,66 @@
+{ type
+, version
+, sha512
+}:
+assert builtins.elem type [ "aspnetcore" "netcore" "sdk"];
+{ stdenv
+, fetchurl
+, libunwind
+, openssl
+, icu
+, libuuid
+, zlib
+, curl
+}: 
+let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk";
+    urls = {
+        aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz";
+        netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz";
+        sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz";
+    };
+    descriptions = {
+        aspnetcore = "ASP .NET Core runtime ${version}";
+        netcore = ".NET Core runtime ${version}";
+        sdk = ".NET SDK ${version}";
+    };
+in stdenv.mkDerivation rec {
+    inherit pname version;
+
+    rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
+
+    src = fetchurl {
+        url = builtins.getAttr type urls;
+        inherit sha512;
+    };
+
+    sourceRoot = ".";
+
+    dontPatchELF = true;
+
+    installPhase = ''
+        runHook preInstall
+        mkdir -p $out/bin
+        cp -r ./ $out
+        ln -s $out/dotnet $out/bin/dotnet
+        runHook postInstall
+    '';
+
+    postFixup = ''
+        patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
+        patchelf --set-rpath "${rpath}" $out/dotnet
+        find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
+    '';
+
+    doInstallCheck = true;
+    installCheckPhase = ''
+        $out/bin/dotnet --info
+    '';
+
+    meta = with stdenv.lib; {
+        homepage = https://dotnet.github.io/;
+        description = builtins.getAttr type descriptions;
+        platforms = [ "x86_64-linux" ];
+        maintainers = with maintainers; [ kuznero ];
+        license = licenses.mit;
+    };
+}
diff --git a/pkgs/development/compilers/dotnet/combinePackages.nix b/pkgs/development/compilers/dotnet/combinePackages.nix
new file mode 100644
index 000000000000..00fb7c6d9b41
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/combinePackages.nix
@@ -0,0 +1,20 @@
+packages:
+{ buildEnv, lib }:
+let cli = builtins.head packages;
+in
+assert lib.assertMsg ((builtins.length packages) != 0)
+    ''You must include at least one package, e.g
+      `with dotnetCorePackages; combinePackages {
+          packages = [ sdk_3_0 aspnetcore_2_1 ];
+       };`'' ;
+  buildEnv {
+    name = "dotnet-core-combined";
+    paths = packages;
+    pathsToLink = [ "/host" "/packs" "/sdk" "/shared" "/templates" ];
+    ignoreCollisions = true;
+    postBuild = ''
+      cp ${cli}/dotnet $out/dotnet
+      mkdir $out/bin
+      ln -s $out/dotnet $out/bin/
+    '';
+  }
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
new file mode 100644
index 000000000000..ab3b6503d091
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -0,0 +1,18 @@
+/*
+How to combine packages for use in development:
+dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ];
+*/
+{ callPackage }:
+let
+  buildDotnet = attrs: callPackage (import ./buildDotnet.nix attrs) {};
+  buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; } );
+  buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; } );
+  buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; } );
+in rec {
+  combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
+
+  sdk_2_2 = buildNetCoreSdk {
+    version = "2.2.401";
+    sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88";
+  };
+}
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
deleted file mode 100644
index 984ab39c91ad..000000000000
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv
-, fetchurl
-, libunwind
-, openssl
-, icu
-, libuuid
-, zlib
-, curl
-}:
-
-let
-  rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
-in
-  stdenv.mkDerivation rec {
-    version = "2.2.401";
-    netCoreVersion = "2.2.6";
-    pname = "dotnet-sdk";
-
-    src = fetchurl {
-      url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz";
-      # use sha512 from the download page
-      sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88";
-    };
-
-    sourceRoot = ".";
-
-    buildPhase = ''
-      runHook preBuild
-      patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet
-      patchelf --set-rpath "${rpath}" ./dotnet
-      find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
-      echo -n "dotnet-sdk version: "
-      ./dotnet --version
-      runHook postBuild
-    '';
-
-    dontPatchELF = true;
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      cp -r ./ $out
-      ln -s $out/dotnet $out/bin/dotnet
-      runHook postInstall
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = https://dotnet.github.io/;
-      description = ".NET Core SDK ${version} with .NET Core ${netCoreVersion}";
-      platforms = [ "x86_64-linux" ];
-      maintainers = with maintainers; [ kuznero ];
-      license = licenses.mit;
-    };
-  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ebc137e0708..891e984a2482 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -213,7 +213,9 @@ in
 
   dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { };
 
-  dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { };
+  dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
+
+  dotnet-sdk = dotnetCorePackages.sdk_2_2;
 
   dumb-init = callPackage ../applications/virtualization/dumb-init {};
 

From af71b9f205b11d443a1d1754e5db843e5bac0c48 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Tue, 12 Nov 2019 00:45:08 +0100
Subject: [PATCH 112/755] dotnetCorePackages.sdk_2_1: init at 2.1.509

---
 pkgs/development/compilers/dotnet/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index ab3b6503d091..6db19092d3d7 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -11,6 +11,10 @@ let
 in rec {
   combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
 
+  sdk_2_1 = buildNetCoreSdk {
+    version = "2.1.509";
+    sha512 = "4B7DC25841F56AADDD685ADB227B362177268E3D052B4ADDDAC2530889B6506B7B4768B751AE75F131143424D02EEE77B4565DAD6B49048C39D2C47E39412FDF";
+  };
   sdk_2_2 = buildNetCoreSdk {
     version = "2.2.401";
     sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88";

From 8277eb9a5b6a0b3a7ec95fdb56600653a78364d6 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Tue, 12 Nov 2019 00:27:14 +0100
Subject: [PATCH 113/755] dotnetCorePackages.sdk_3_0: init at 3.0.100

---
 pkgs/development/compilers/dotnet/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 6db19092d3d7..87a2f7679976 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -19,4 +19,8 @@ in rec {
     version = "2.2.401";
     sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88";
   };
+  sdk_3_0 = buildNetCoreSdk {
+    version = "3.0.100";
+    sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";
+  };
 }

From e51e429a34feeb38d2a80ec8e8c79fa2c4a89c6b Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Tue, 12 Nov 2019 00:29:21 +0100
Subject: [PATCH 114/755] dotnetCorePackages.netcore_2_1: init at 2.1.13

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 87a2f7679976..e3aa0964cc09 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -11,6 +11,11 @@ let
 in rec {
   combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
 
+  netcore_2_1 = buildNetCore {
+    version = "2.1.13";
+    sha512 = "2gkawhm4vk74qmdlpa9128brirwqxpa1b6w8jmcyd6j4i8lpnkp83jhmjjrjr4jdihchapp8qxb7sa1qdj21yswbpn03n86g8l3gh0h";
+  };
+
   sdk_2_1 = buildNetCoreSdk {
     version = "2.1.509";
     sha512 = "4B7DC25841F56AADDD685ADB227B362177268E3D052B4ADDDAC2530889B6506B7B4768B751AE75F131143424D02EEE77B4565DAD6B49048C39D2C47E39412FDF";

From a0687d54a524771ca6f0e1e3cbbd6286c83ddf00 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Tue, 12 Nov 2019 00:31:49 +0100
Subject: [PATCH 115/755] dotnetCorePackages.aspnetcore_2_1: init at 2.1.13

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index e3aa0964cc09..118477b6b65d 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -11,6 +11,11 @@ let
 in rec {
   combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
 
+  aspnetcore_2_1 = buildAspNetCore {
+    version = "2.1.13";
+    sha512 = "0i9r9pq9avixv08vwcp796kdwplz90lip07y4f50s0jqwpww070qsydplnv3pixi9dfn4s169qd97c7km3qs1snvn9yasigg1vv2wqx";
+  };
+
   netcore_2_1 = buildNetCore {
     version = "2.1.13";
     sha512 = "2gkawhm4vk74qmdlpa9128brirwqxpa1b6w8jmcyd6j4i8lpnkp83jhmjjrjr4jdihchapp8qxb7sa1qdj21yswbpn03n86g8l3gh0h";

From b708e36ecbf40c0a2d485a2ef6c50b35e72fea22 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Fri, 13 Dec 2019 13:09:41 +0100
Subject: [PATCH 116/755] dotnetCorePakages.sdk_3_1: init at 3.1.100

---
 pkgs/development/compilers/dotnet/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 118477b6b65d..1d9540ccc167 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -33,4 +33,8 @@ in rec {
     version = "3.0.100";
     sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";
   };
+  sdk_3_1 = buildNetCoreSdk {
+    version = "3.1.100";
+    sha512 = "0hvshwsgbm6v5hc1plzdzx8bwsdna2167fnfhxpysqs5mz7crsa4f13m4cxhrbn64lasqz2007nhdrlpgaqvgll6q8736h884aaw5sj";
+  };
 }

From 6bc3acd3b9088cd58761da9b1703b17901cca9b9 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Thu, 16 Jan 2020 12:55:52 +0100
Subject: [PATCH 117/755] dotnetPackages: Fix apphost binary

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

diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix
index 0c2222c4c83d..58e67ff008ae 100644
--- a/pkgs/development/compilers/dotnet/buildDotnet.nix
+++ b/pkgs/development/compilers/dotnet/buildDotnet.nix
@@ -49,6 +49,7 @@ in stdenv.mkDerivation rec {
         patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
         patchelf --set-rpath "${rpath}" $out/dotnet
         find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
+        find $out -type f -name "apphost" -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \;
     '';
 
     doInstallCheck = true;

From a7c1908226c82982151482070a6daf48750501f9 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 11 Jan 2020 13:39:47 +0900
Subject: [PATCH 118/755] spago: 0.13.0 -> 0.13.1

---
 pkgs/development/tools/purescript/spago/spago.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index c85cff2f03a4..1a7ec35748ba 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -11,11 +11,11 @@
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.13.0";
+  version = "0.13.1";
   src = fetchgit {
     url = "https://github.com/spacchetti/spago.git";
-    sha256 = "158xq5zn32iwswxmpma92763hl6kzq7kb01cyvphmmlilx55b6yk";
-    rev = "426838670ba9de4593f4c533a6947efb2d8ad4ba";
+    sha256 = "0l6sy1hz5dbnrjkvb2f44afhd48nwqx5kx1h29ns93xbbd57hci8";
+    rev = "b87858609c671d8f3dc78f858ce1d8c492bd1062";
     fetchSubmodules = true;
   };
   isLibrary = true;

From cedb9c1c1c6121a4c2d8635828df653da7ad6b1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 16 Jan 2020 12:10:54 +0100
Subject: [PATCH 119/755] hackage2nix: honor LTS for lambdabot, but not for
 cabal2spec

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2d144651bc00..386b6c056dec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1198,6 +1198,8 @@ default-package-overrides:
   - l10n ==0.1.0.1
   - labels ==0.3.3
   - lackey ==1.0.10
+  - lambdabot-core ==5.2
+  - lambdabot-irc-plugins ==5.2
   - LambdaHack ==0.9.5.0
   - lame ==0.2.0
   - language-c ==0.8.3

From 42273f0e675141b451346228f8c2d18974a2a028 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:39:37 +0100
Subject: [PATCH 120/755] hackage2nix: update list of broken packages

---
 .../configuration-hackage2nix.yaml            | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 386b6c056dec..2f8767a84387 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2778,6 +2778,7 @@ broken-packages:
   - accelerate-fftw
   - accelerate-fourier
   - accelerate-kullback-liebler
+  - accelerate-llvm
   - accelerate-llvm-native
   - accelerate-random
   - accelerate-typelits
@@ -2884,6 +2885,7 @@ broken-packages:
   - algebra
   - algebra-sql
   - algebraic
+  - algebraic-classes
   - algebraic-graphs
   - algebraic-prelude
   - algo-s
@@ -2912,6 +2914,7 @@ broken-packages:
   - AMI
   - ampersand
   - amqp-conduit
+  - amqp-utils
   - analyze
   - analyze-client
   - anansi-pandoc
@@ -3014,6 +3017,7 @@ broken-packages:
   - ariadne
   - arion
   - arith-encode
+  - arithmetic-circuits
   - armada
   - armor
   - arpa
@@ -3107,6 +3111,7 @@ broken-packages:
   - avl-static
   - AvlTree
   - avr-shake
+  - avro-piper
   - awesome-prelude
   - awesomium
   - awesomium-glut
@@ -4243,6 +4248,7 @@ broken-packages:
   - dictionaries
   - dictparser
   - diet
+  - diff
   - diffcabal
   - difference-monoid
   - DifferenceLogic
@@ -4462,6 +4468,7 @@ broken-packages:
   - elevator
   - elision
   - elliptic-curve
+  - elm-street
   - elm-websocket
   - elsa
   - elynx-seq
@@ -4498,6 +4505,7 @@ broken-packages:
   - EnumMap
   - enummapmap
   - enummapset-th
+  - env-extra
   - env-parser
   - envstatus
   - epanet-haskell
@@ -4574,6 +4582,7 @@ broken-packages:
   - exact-real
   - exact-real-positional
   - except-exceptions
+  - exception-hierarchy
   - exception-monads-fd
   - exchangerates
   - execs
@@ -4604,6 +4613,7 @@ broken-packages:
   - extended-categories
   - extensible-data
   - extensible-effects-concurrent
+  - extensible-skeleton
   - Extra
   - extract-dependencies
   - extractelf
@@ -4839,6 +4849,7 @@ broken-packages:
   - freddy
   - free-category
   - free-concurrent
+  - free-functors
   - free-game
   - free-http
   - free-operational
@@ -5041,6 +5052,7 @@ broken-packages:
   - ghci-lib
   - ghci-ng
   - ghci-pretty
+  - ghcide
   - ghcjs-base-stub
   - ghcjs-dom-jsffi
   - ghcjs-fetch
@@ -5051,6 +5063,7 @@ broken-packages:
   - ghcprofview
   - ght
   - gi-cairo-again
+  - gi-gdkx11
   - gi-graphene
   - gi-gsk
   - gi-gstpbutils
@@ -5076,6 +5089,7 @@ broken-packages:
   - git-fmt
   - git-gpush
   - git-jump
+  - git-mediate
   - git-object
   - git-remote-ipfs
   - git-repair
@@ -5249,6 +5263,7 @@ broken-packages:
   - gstreamer
   - GTALib
   - gtfs
+  - gtfs-realtime
   - gtk-serialized-event
   - gtk-toy
   - gtk2hs-hello
@@ -5495,6 +5510,7 @@ broken-packages:
   - haskell-src-exts-prisms
   - haskell-src-exts-qq
   - haskell-src-exts-sc
+  - haskell-src-exts-simple
   - haskell-src-meta-mwotton
   - haskell-stack-trace-plugin
   - haskell-token-utils
@@ -5786,6 +5802,7 @@ broken-packages:
   - hiccup
   - hichi
   - hid-examples
+  - hie-bios
   - hie-core
   - hieraclus
   - hierarchical-clustering
@@ -5971,6 +5988,7 @@ broken-packages:
   - hpaste
   - hpasteit
   - HPath
+  - hpath-io
   - hpc-tracer
   - hPDB
   - hPDB-examples
@@ -6223,6 +6241,8 @@ broken-packages:
   - http-shed
   - http-streams
   - http-wget
+  - http2-client
+  - http2-client-exe
   - http2-client-grpc
   - http2-grpc-proto3-wire
   - https-everywhere-rules
@@ -6250,6 +6270,7 @@ broken-packages:
   - hunt-searchengine
   - hunt-server
   - hurdle
+  - hurl
   - hurriyet
   - husk-scheme
   - husk-scheme-libs
@@ -6413,6 +6434,7 @@ broken-packages:
   - indieweb-algorithms
   - inf-interval
   - infer-upstream
+  - infernal
   - infernu
   - infinity
   - infix
@@ -6435,6 +6457,7 @@ broken-packages:
   - instapaper-sender
   - instinct
   - int-multimap
+  - intcode
   - integer-pure
   - integreat
   - intel-aes
@@ -6847,6 +6870,7 @@ broken-packages:
   - Level0
   - levmar
   - levmar-chart
+  - lex-applicative
   - lfst
   - lgtk
   - lha
@@ -6962,6 +6986,7 @@ broken-packages:
   - llvm-general
   - llvm-general-pure
   - llvm-general-quote
+  - llvm-hs
   - llvm-hs-pretty
   - llvm-ht
   - llvm-pkg-config
@@ -7413,6 +7438,9 @@ broken-packages:
   - mtl-tf
   - mtlx
   - mtp
+  - mu-grpc-client
+  - mu-grpc-server
+  - mu-protobuf
   - MuCheck
   - MuCheck-Hspec
   - MuCheck-HUnit
@@ -7549,6 +7577,7 @@ broken-packages:
   - network-anonymous-tor
   - network-api-support
   - network-arbitrary
+  - network-bitcoin
   - network-builder
   - network-bytestring
   - network-connection
@@ -7792,6 +7821,7 @@ broken-packages:
   - Paillier
   - pairing
   - pam
+  - pan-os-syslog
   - panda
   - pandoc-citeproc-preamble
   - pandoc-crossref
@@ -7832,6 +7862,7 @@ broken-packages:
   - parco-parsec
   - parconc-examples
   - pareto
+  - parquet-hs
   - Parry
   - parse-help
   - parseargs
@@ -8137,6 +8168,7 @@ broken-packages:
   - presto-hdbc
   - pretty-ncols
   - pretty-relative-time
+  - prettyprinter-graphviz
   - prettyprinter-vty
   - preview
   - prim-array
@@ -8388,6 +8420,7 @@ broken-packages:
   - reactive-glut
   - reactive-thread
   - reactor
+  - read-ctags
   - read-io
   - reader-soup
   - readline-statevar
@@ -8431,10 +8464,13 @@ broken-packages:
   - reflex-basic-host
   - reflex-dom-retractable
   - reflex-dom-svg
+  - reflex-fsnotify
+  - reflex-ghci
   - reflex-gloss
   - reflex-gloss-scene
   - reflex-libtelnet
   - reflex-orphans
+  - reflex-process
   - reflex-sdl2
   - reflex-transformers
   - reflex-vty
@@ -8447,6 +8483,7 @@ broken-packages:
   - reg-alloc-graph-color
   - regex-deriv
   - regex-dfa
+  - regex-do
   - regex-generator
   - regex-parsec
   - regex-pderiv
@@ -8762,6 +8799,7 @@ broken-packages:
   - seclib
   - second-transfer
   - secp256k1
+  - secp256k1-haskell
   - secp256k1-legacy
   - secret-santa
   - secret-sharing
@@ -8926,6 +8964,7 @@ broken-packages:
   - shellmate-extras
   - shh
   - shh-extras
+  - shine-examples
   - shivers-cfg
   - shoap
   - shopify
@@ -8981,6 +9020,7 @@ broken-packages:
   - simplenote
   - simpleprelude
   - SimpleServer
+  - simplest-sqlite
   - simseq
   - singleton-dict
   - singleton-typelits
@@ -9315,6 +9355,7 @@ broken-packages:
   - streaming-postgresql-simple
   - streaming-process
   - streaming-sort
+  - streamly-fsnotify
   - strelka
   - strict-data
   - StrictBench
@@ -9437,6 +9478,7 @@ broken-packages:
   - Tablify
   - tabloid
   - tabs
+  - taffybar
   - tag-bits
   - tag-stream
   - tagged-exception-core
@@ -9602,6 +9644,7 @@ broken-packages:
   - thumbnail-plus
   - thumbnail-polish
   - tic-tac-toe
+  - ticker
   - tickle
   - TicTacToe
   - tictactoe3d
@@ -9661,6 +9704,7 @@ broken-packages:
   - todos
   - tofromxml
   - toilet
+  - token-search
   - tokenify
   - tokstyle
   - toktok
@@ -9750,6 +9794,7 @@ broken-packages:
   - tripLL
   - trivia
   - tropical
+  - tropical-geometry
   - truelevel
   - trurl
   - tsession
@@ -9983,7 +10028,9 @@ broken-packages:
   - vcsgui
   - vcswrapper
   - Vec-Boolean
+  - vec-lens
   - Vec-OpenGLRaw
+  - vec-optics
   - Vec-Transform
   - vect-floating
   - vect-floating-accelerate
@@ -10104,6 +10151,7 @@ broken-packages:
   - warp-dynamic
   - warp-grpc
   - warp-static
+  - warp-systemd
   - WashNGo
   - wasm
   - watcher

From f3769d7015126515b99133cc264f22956d809cfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jan 2020 02:30:57 +0100
Subject: [PATCH 121/755] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b2812edaaed9f9033e48dfbcd45e7e5fb56daccd.
---
 .../haskell-modules/hackage-packages.nix      | 1676 ++++++++++++++---
 1 file changed, 1400 insertions(+), 276 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0d2cce19bf71..ccd120cfd2ea 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3226,6 +3226,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libdevil;};
 
+  "Color" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
+     , data-default-class, deepseq, doctest, hspec, HUnit, QuickCheck
+     , random, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "Color";
+       version = "0.1.1";
+       sha256 = "0jwqyvch7mpg83q57c50qc0visgc0nav6ihb8gr81wdp8i3f680k";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base data-default-class deepseq vector ];
+       testHaskellDepends = [
+         base colour doctest hspec HUnit QuickCheck random template-haskell
+         vector
+       ];
+       benchmarkHaskellDepends = [ base colour criterion deepseq random ];
+       description = "Color spaces and conversions between them";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Combinatorrent" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, cereal
      , containers, deepseq, directory, filepath, hopenssl, hslogger
@@ -6351,8 +6371,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames-dsv";
-       version = "0.1.1";
-       sha256 = "0932k8aqn9c08ijbs29g04gcka441gg424g90cqd4ky9b3yxzm7w";
+       version = "0.1.2";
+       sha256 = "0zdcbysiai7lskm8lmf454022ad0kgwl0v0kzj9596fvbdx0gdi2";
        libraryHaskellDepends = [
          base bytestring Frames hw-dsv pipes template-haskell text vector
          vinyl
@@ -14942,8 +14962,8 @@ self: {
     ({ mkDerivation, base, hashable, syb }:
      mkDerivation {
        pname = "OptDir";
-       version = "0.0.3";
-       sha256 = "1bb5s57d3wyr9rd275jl0sk85yisl1dpbz042yg7pksv5l0xal0q";
+       version = "0.0.4";
+       sha256 = "07l2fagp60ykhsr3dxclkfgg1pxawj2xf0wxrn3dksjdlx0hg5j5";
        libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
        license = stdenv.lib.licenses.bsd3;
@@ -28216,7 +28236,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "amqp_0_19_0" = callPackage
+  "amqp_0_19_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -28224,8 +28244,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.19.0";
-       sha256 = "1v2jwf9y6mw9f89a9ca66p42da8g5n1ain89gjr7sv6v6r2jxinj";
+       version = "0.19.1";
+       sha256 = "1802gngl74niszw355caf6x41ayfvyg2hpbckgshp7rlhfqdjabj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28318,8 +28338,8 @@ self: {
     ({ mkDerivation, base, deepseq, parsec }:
      mkDerivation {
        pname = "amrun";
-       version = "0.0.0.6";
-       sha256 = "01hnjzlww282hjlc6vbn51qps577hx4ll3pz4g5kn0r4h2bylad9";
+       version = "0.0.0.7";
+       sha256 = "13mc0vq51nhg3n7ff1k2045a9zkg3l5a3hr3wnz7ybfw8j457g78";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base deepseq parsec ];
@@ -29761,13 +29781,18 @@ self: {
      }:
      mkDerivation {
        pname = "api-rpc-pegnet";
-       version = "0.1.0.0";
-       sha256 = "14jb78bkdd8ywwnks3pvi8ynagsri938znyh9ylvyr5mph9ngmnc";
+       version = "0.1.1.2";
+       sha256 = "16f7849awll42w58zznf11dri3p2snd4p7cb87ygsrdx1f96gxp6";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring http-client http-client-tls
          http-conduit json-alt network remote-json remote-json-client
          remote-monad text time transformers
        ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring http-client http-client-tls
+         http-conduit json-alt network remote-json remote-json-client
+         remote-monad text time transformers
+       ];
        description = "simple json-rpc client for PegNet";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30155,8 +30180,8 @@ self: {
      }:
      mkDerivation {
        pname = "apns-http2";
-       version = "0.1.0.0";
-       sha256 = "1mbsvv202h6vh1gkv4rhx369wagil111qbphb502v02v2g5yibdb";
+       version = "0.1.1.0";
+       sha256 = "1hwybh3c6drqji34x7zwr68l642018ajrdzs4711dxws0ib63jrw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30880,15 +30905,17 @@ self: {
      }) {debian-mirror = null; help = null;};
 
   "archive-libarchive" = callPackage
-    ({ mkDerivation, base, bytestring, composition-prelude, libarchive
+    ({ mkDerivation, base, bytestring, composition-prelude, cpphs
+     , libarchive
      }:
      mkDerivation {
        pname = "archive-libarchive";
-       version = "0.2.0.0";
-       sha256 = "0gy52dw00b110f5nc6gbnfgs5nssv7r8az1vy8xr1xj1dnpjwb74";
+       version = "0.2.2.0";
+       sha256 = "0gxhfimfyz4ik8qrin9hf70rmgdalrgc2dark6pp3xnkv1hnxw8r";
        libraryHaskellDepends = [
          base bytestring composition-prelude libarchive
        ];
+       libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30901,8 +30928,8 @@ self: {
      }:
      mkDerivation {
        pname = "archive-sig";
-       version = "0.2.1.2";
-       sha256 = "03fwzl7pkb025adzv1jzh96k0h91b1w7arxza7q53i492n96qg8i";
+       version = "0.2.2.0";
+       sha256 = "1dia7j8kqjps6s67xd25fqd21wvnsp89lcvkyabvr47skfjaag3l";
        libraryHaskellDepends = [
          base bytestring composition-prelude dir-traverse
        ];
@@ -30911,14 +30938,16 @@ self: {
      }) {};
 
   "archive-tar" = callPackage
-    ({ mkDerivation, base, bytestring, composition-prelude, tar }:
+    ({ mkDerivation, base, bytestring, composition-prelude, cpphs, tar
+     }:
      mkDerivation {
        pname = "archive-tar";
-       version = "0.2.0.0";
-       sha256 = "0svbxr9734ysskilv5kvhfd7s436spn149pb5bcsq3hjz1zq5xq7";
+       version = "0.2.2.0";
+       sha256 = "1rvygznl8vwsbbdr0rin925w380c3ncqf486pdzy8jx62naip02q";
        libraryHaskellDepends = [
          base bytestring composition-prelude tar
        ];
+       libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31287,6 +31316,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmetic-circuits" = callPackage
+    ({ mkDerivation, aeson, base, bulletproofs, containers, criterion
+     , elliptic-curve, filepath, galois-fft, galois-field
+     , markdown-unlit, MonadRandom, pairing, poly, process-extras
+     , protolude, QuickCheck, quickcheck-instances, semirings, tasty
+     , tasty-discover, tasty-hunit, tasty-quickcheck, text, vector
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "arithmetic-circuits";
+       version = "0.2.0";
+       sha256 = "09fqcg8302dklzlr3fqlac09zzfws3li45nri4cd886cx8b1vzzq";
+       libraryHaskellDepends = [
+         aeson base bulletproofs containers elliptic-curve filepath
+         galois-fft galois-field MonadRandom poly process-extras protolude
+         semirings text vector wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base bulletproofs containers elliptic-curve filepath
+         galois-fft galois-field markdown-unlit MonadRandom pairing poly
+         process-extras protolude QuickCheck quickcheck-instances semirings
+         tasty tasty-discover tasty-hunit tasty-quickcheck text vector
+         wl-pprint-text
+       ];
+       testToolDepends = [ markdown-unlit tasty-discover ];
+       benchmarkHaskellDepends = [
+         aeson base bulletproofs containers criterion elliptic-curve
+         filepath galois-fft galois-field MonadRandom pairing poly
+         process-extras protolude semirings text vector wl-pprint-text
+       ];
+       description = "Arithmetic circuits for zkSNARKs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arithmoi" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
      , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
@@ -32062,6 +32125,48 @@ self: {
        broken = true;
      }) {};
 
+  "asif_6_0_4" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+     , conduit-combinators, conduit-extra, containers, cpu, directory
+     , doctest, doctest-discover, either, exceptions, foldl
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-ip, lens, network, old-locale
+     , optparse-applicative, profunctors, resourcet, temporary-resourcet
+     , text, thyme, transformers, vector
+     }:
+     mkDerivation {
+       pname = "asif";
+       version = "6.0.4";
+       sha256 = "1613r90sfw7q0gsiyjd8j9s1gcjmwj4lsngx3qqpykcivy2ggs03";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu either exceptions foldl generic-lens
+         hw-bits hw-ip lens network old-locale profunctors resourcet
+         temporary-resourcet text thyme transformers vector
+       ];
+       executableHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu directory either exceptions foldl
+         generic-lens hw-bits hw-ip lens network old-locale
+         optparse-applicative profunctors resourcet temporary-resourcet text
+         thyme transformers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu doctest doctest-discover either
+         exceptions foldl generic-lens hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-ip lens network old-locale profunctors
+         resourcet temporary-resourcet text thyme transformers vector
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       description = "Library for creating and querying segmented feeds";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "asil" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, directory, filepath, haskell-src-exts, mtl
@@ -34264,6 +34369,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_4_6_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, bytestring, containers, data-binary-ieee754, deepseq
+     , directory, doctest, doctest-discover, extra, fail, gauge
+     , hashable, hspec, hspec-discover, lens, lens-aeson, mtl
+     , QuickCheck, random, raw-strings-qq, scientific, semigroups
+     , tagged, template-haskell, text, tf-random, transformers
+     , unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.4.6.0";
+       sha256 = "127w8pny2ah05wa44khqs53vdyh54jlxvihxhpqk94wx8ggg00vx";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers data-binary-ieee754 deepseq fail hashable mtl scientific
+         semigroups tagged template-haskell text tf-random
+         unordered-containers vector zlib
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers directory doctest doctest-discover extra fail hashable
+         hspec lens lens-aeson mtl QuickCheck raw-strings-qq scientific
+         semigroups tagged template-haskell text tf-random transformers
+         unordered-containers vector zlib
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers gauge hashable mtl random
+         raw-strings-qq template-haskell text transformers
+         unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avro-piper" = callPackage
     ({ mkDerivation, aeson, avro, base, bytestring, conduit
      , conduit-combinators, conduit-extra, hedgehog, hspec
@@ -34272,8 +34414,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro-piper";
-       version = "1.0.2";
-       sha256 = "17pygij07wg9583yxkhw7zc43ik7zjgb5ncx4hsksknawax83mza";
+       version = "1.0.3";
+       sha256 = "1vi0mgpqpr74ankl8418npklyfxacxg001vppps22p2da97s3pk1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34813,6 +34955,25 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "aws-lambda-haskell-runtime_2_0_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, http-client
+     , http-types, path, path-io, safe-exceptions-checked
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "aws-lambda-haskell-runtime";
+       version = "2.0.3";
+       sha256 = "1ycqwmpgqzdb8kz3w6yzf44id32pc3vin1w3j0klzzg2k51l4nnr";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-types path path-io
+         safe-exceptions-checked template-haskell text
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Haskell runtime for AWS Lambda";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aws-lambda-runtime" = callPackage
     ({ mkDerivation, aeson, async, base, base-compat, bytestring
      , containers, deepseq, filepath, http-client, http-media
@@ -35835,6 +35996,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "barbies_2_0_0_0" = callPackage
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, transformers
+     }:
+     mkDerivation {
+       pname = "barbies";
+       version = "2.0.0.0";
+       sha256 = "0rbwdx9s940wfrlkay772i0q11rbywnhzigh5wy8sppx19pgfq9z";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Classes for working with types that can change clothes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "barbies-th" = callPackage
     ({ mkDerivation, barbies, base, template-haskell }:
      mkDerivation {
@@ -36341,8 +36519,8 @@ self: {
      }:
      mkDerivation {
        pname = "base64";
-       version = "0.3.1.0";
-       sha256 = "0fs6lgjxf8z6n1vzjjjq5i952rklj9skgazx8zzi6dzi98ib6dg6";
+       version = "0.3.1.1";
+       sha256 = "0g812lfql9agbdmrqvwc42sb91sibdd6w50mw3kvfz0fflskkiip";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base base64-bytestring random-bytestring tasty tasty-hunit text
@@ -36376,6 +36554,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base64-bytestring_1_0_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , HUnit, QuickCheck, split, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "base64-bytestring";
+       version = "1.0.0.3";
+       sha256 = "1iwg03z1w9n3n3q68siwk0dmwkb3sygmravbwbrs7h0lxih9s5gg";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring containers HUnit QuickCheck split test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq
+       ];
+       description = "Fast base64 encoding and decoding for ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base64-bytestring-type" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , binary, bytestring, cereal, deepseq, hashable, http-api-data
@@ -37478,6 +37678,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bench-show_0_3_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
+     , directory, filepath, mwc-random, optparse-applicative
+     , optparse-simple, semigroups, split, statistics, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "bench-show";
+       version = "0.3.1";
+       sha256 = "0z1fdcdl9chwia9kd5pa9572mc5pmy5bld72axkzg20r7v53sr7k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
+         mwc-random split statistics transformers vector
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
+         mwc-random optparse-applicative optparse-simple semigroups split
+         statistics transformers vector
+       ];
+       testHaskellDepends = [ base split text ];
+       description = "Show, plot and compare benchmark results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -42306,8 +42533,8 @@ self: {
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.9";
-       sha256 = "1f4lnshc4b3r9qyc6y476qpkcl3hkripqsd2vfyg9q0xbyg9pxq6";
+       version = "0.0.0.10";
+       sha256 = "0lssarfp05v6mnwn1qkgj8gjzszb43dhbs3025b60cmwsbnhfx2w";
        libraryHaskellDepends = [
          base containers directory mtl temporary time
        ];
@@ -44815,6 +45042,8 @@ self: {
        pname = "bytesmith";
        version = "0.3.2.0";
        sha256 = "0wbmi3wgf85rkhymjiv19dq93i2mg9i74dl37lpkq317qlihgv6f";
+       revision = "1";
+       editedCabalFile = "10r36zdpl96cv2jmkddfq92h78bx6785gjb29769c1dw0nnlvj94";
        libraryHaskellDepends = [
          base byteslice bytestring contiguous primitive run-st text-short
          wide-word
@@ -45685,6 +45914,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-build-programs" = callPackage
+    ({ mkDerivation, base, Cabal }:
+     mkDerivation {
+       pname = "cabal-build-programs";
+       version = "0.1.0.1";
+       sha256 = "004xr0f59fg6h6rxlf7sf6m2mi6p32h2z3vs9b56hddmxp3gn4vl";
+       libraryHaskellDepends = [ base Cabal ];
+       description = "Adds executable dependencies to the Cabal build";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-bundle-clib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, temporary, text, time
@@ -46374,6 +46614,28 @@ self: {
        broken = true;
      }) {};
 
+  "cabal-rpm_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, optparse-applicative
+     , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "2.0.0";
+       sha256 = "1gr68l5bg2mfl6b8nbfzcinibldk271psxp5wkiw14mclyx7ln8g";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit optparse-applicative process
+         simple-cabal simple-cmd simple-cmd-args time unix
+       ];
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -47410,8 +47672,8 @@ self: {
      }:
      mkDerivation {
        pname = "call-alloy";
-       version = "0.2.0.1";
-       sha256 = "177p5k225bglz602p711pjvym3p93jihxyh4r25yvrh3kb6wi0l4";
+       version = "0.2.0.4";
+       sha256 = "0j1vvnjvgjs11ffy7r5h87vsxywyp51cs8kvqlgi5vnlwb2zfxg9";
        libraryHaskellDepends = [
          base bytestring containers directory file-embed filepath hashable
          lens mtl process split trifecta unix
@@ -54058,8 +54320,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.2.5";
-       sha256 = "1md3dyfaybhmfprw3qdwqvlh0r73wy8smf8j8jkdrlkxqw6vhd1f";
+       version = "0.1.2.6";
+       sha256 = "1p76m7qgvcl01zyvb8zmbp5064dp2qjd3rr3mjcai55pk5xcm35r";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -55873,6 +56135,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compendium-client" = callPackage
+    ({ mkDerivation, aeson, base, http-client, language-protobuf
+     , megaparsec, servant, servant-client, text
+     }:
+     mkDerivation {
+       pname = "compendium-client";
+       version = "0.1.0.1";
+       sha256 = "09j71sjqpzhmzkmr1439qqwc8nizgc5ag7fmbd8z51wnkmw1wmky";
+       libraryHaskellDepends = [
+         aeson base http-client language-protobuf megaparsec servant
+         servant-client text
+       ];
+       description = "Client for the Compendium schema server";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "compensated" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
      , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
@@ -56102,8 +56380,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.6.0.0";
-       sha256 = "0r15hc6kwg0dibxix2f5afg91qwc6fd5m9sijn0k0mq62f0ln7ki";
+       version = "0.6.1.0";
+       sha256 = "1a5h03h46ahighdqqxfa22mnhbik9bqzm0cxnpgxyjksbagj3x5x";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -56128,8 +56406,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson-refined";
-       version = "0.6.0.0";
-       sha256 = "1plhqx0k0xab8fkip6v96rqnrdjq02ph1gmrk4r5zq5x4gc7gpps";
+       version = "0.6.1.0";
+       sha256 = "1z03ncjabcph9vwwhzmqp7wmhznr7jz188xpnl2lsdw0fzxlir3q";
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
@@ -56146,8 +56424,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.6.0.0";
-       sha256 = "188za7x9069ah8sgf8laqwkg3yfzl7cm23iacbcnbw25jd7k6vy3";
+       version = "0.6.1.0";
+       sha256 = "0qnxchx5dr2bgi8wdi4a1x2z20lw61zfxlmjkr1m7ggzz3f7py3k";
        libraryHaskellDepends = [
          base exceptions lens monad-control mtl profunctors template-haskell
          text transformers transformers-base unliftio-core vinyl
@@ -56168,8 +56446,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.6.0.0";
-       sha256 = "065aah2jx6r8i8qgwfql90nc6avhrrhc3aq3zlrqimqwv4772pvj";
+       version = "0.6.1.0";
+       sha256 = "14pa5bcr0ip43vn6wpxd4pf7lcc83f2xscri05kdf4h4d1nnwscj";
        libraryHaskellDepends = [
          base composite-base ekg-core lens text vinyl
        ];
@@ -56186,8 +56464,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.6.0.0";
-       sha256 = "13hpvk6wx7yiz7klay7da8lllvszddlixk9xxyc8w9kqq48b4k92";
+       version = "0.6.1.0";
+       sha256 = "1vqj7pwb0wkz7c4clqj7kmc0asg74i7xb92g0g0qmwavwwc9flq1";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -56210,8 +56488,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-swagger";
-       version = "0.6.0.0";
-       sha256 = "1m0a77imgrs55vmzvfx7hy74siwnxpcgjg7cawsmsnarkymb1c5c";
+       version = "0.6.1.0";
+       sha256 = "1ysp297b2nrwq6dx3bv9q44f69hlym4yvbimzj1hqc3mz63qjpaz";
        libraryHaskellDepends = [
          base composite-base insert-ordered-containers lens swagger2
          template-haskell text vinyl
@@ -57292,10 +57570,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-audio-sndfile";
-       version = "0.1.2.1";
-       sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
-       revision = "2";
-       editedCabalFile = "00c628bx1j8p342pc03p884illajqsgi47yplfxvdywxcijnwbn3";
+       version = "0.1.2.2";
+       sha256 = "1pfvsq0jz9j66ajzc0avnhchn77l22clp71kf2p7dnrib05xc757";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -60384,8 +60660,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.4.0";
-       sha256 = "1zamw8c9y5r813ksirlbiz0sk20qclmjcwmg6z2h5495883ihxkj";
+       version = "0.2.4.1";
+       sha256 = "0amv5kwba1amh6nsqfh6bb2gm7a3ky5lrjjr9c88w0qfyk8rr3am";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63450,6 +63726,36 @@ self: {
        broken = true;
      }) {};
 
+  "cut-the-crap" = callPackage
+    ({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core
+     , lens, optparse-applicative, optparse-generic, regex-tdfa, shelly
+     , system-filepath, temporary, text, unliftio-core
+     }:
+     mkDerivation {
+       pname = "cut-the-crap";
+       version = "1.0.0";
+       sha256 = "0mq6hzv48ry3n8y0b60qbf3ddkfk2aqny4c1hzn92mqffhg4r0zr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base exceptions generic-lens lens optparse-applicative
+         optparse-generic regex-tdfa shelly system-filepath temporary text
+         unliftio-core
+       ];
+       executableHaskellDepends = [
+         base exceptions generic-lens lens optparse-applicative
+         optparse-generic regex-tdfa shelly system-filepath temporary text
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         base exceptions generic-lens hspec hspec-core lens
+         optparse-applicative optparse-generic regex-tdfa shelly
+         system-filepath temporary text unliftio-core
+       ];
+       description = "Cuts out uninteresting parts of videos by detecting silences";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cutter" = callPackage
     ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet
      , utility-ht
@@ -63515,6 +63821,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cyclotomic_1_0_1" = callPackage
+    ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-smallcheck
+     }:
+     mkDerivation {
+       pname = "cyclotomic";
+       version = "1.0.1";
+       sha256 = "0d2jnpgal88j05jk62p3xwfkarigclgw2hy77ph0lii360wijljh";
+       libraryHaskellDepends = [ arithmoi base containers ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-smallcheck
+       ];
+       description = "A subfield of the complex numbers for exact calculation";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cypher" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , classy-parallel, conduit, http-conduit, http-types, resourcet
@@ -69155,7 +69480,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dhall_1_28_0" = callPackage
+  "dhall_1_29_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
      , base, bytestring, case-insensitive, cborg, cborg-json, containers
      , contravariant, cryptonite, data-fix, deepseq, Diff, directory
@@ -69172,8 +69497,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.28.0";
-       sha256 = "0kiw8a9im768j304s80pv90vp1hh38v7fxfh2bb4hmglh3a8kc21";
+       version = "1.29.0";
+       sha256 = "1xp76wv36rfffym71gwdqsmwg3znmpsq5x9zgz3hfmzigxqmjgn7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69225,14 +69550,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_25" = callPackage
+  "dhall-bash_1_0_27" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.25";
-       sha256 = "0bxfx2hj06q1w1372zc7cfibsqw2hckz5116zz447mz5zmcfkjv3";
+       version = "1.0.27";
+       sha256 = "0mmf53fqgf8g6s80g6wss86lcfkrpjc51w5givy7kg9js00d48px";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69330,7 +69655,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_6_0" = callPackage
+  "dhall-json_1_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
      , base, bytestring, containers, dhall, exceptions, filepath
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -69339,8 +69664,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.6.0";
-       sha256 = "1fb3w7p2blnxqc6q3q620vpr0fpqs2my7hh33ykh7jpzs7p031h5";
+       version = "1.6.1";
+       sha256 = "1j89a75rqr90y6yya17iym6c9d6f4sa5hhmv46qbwim9sflv1s9w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69389,8 +69714,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-lsp-server";
-       version = "1.0.3";
-       sha256 = "1ym7v3blgj4ccchg6cpyxpllp6xz6fh8kfyy3i0b1kd5lzm90s0n";
+       version = "1.0.4";
+       sha256 = "0w8xql6hxchgs77ik2fgnhb2llp6138jyiynwvhsfkjijmqj5qrl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69416,8 +69741,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.10";
-       sha256 = "04fb8l9qh70fqa50ck0hz8134s1bmcyscbf5xg5ylnxpdrs3n7as";
+       version = "1.1.11";
+       sha256 = "0af8nbakaznw8wvrdgslrqk7fnmv2425f67xv3cx1jlf51drphpk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69487,8 +69812,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-yaml";
-       version = "1.0.0";
-       sha256 = "05jhcvikm3rbcf9jzw747x70c3dsslcij977yhqks0c59nr9pqn6";
+       version = "1.0.1";
+       sha256 = "1pm36mwq6llnys9ac3b5nisw7d9xjxgh6nh2xl3kcdjh30f3bm2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69773,10 +70098,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.4.1";
-       sha256 = "0n368gv7jjnynp7gfbnaywnd4x65956qqifcxpi3gsy8yi0zsr6z";
-       revision = "1";
-       editedCabalFile = "0irrv1mf7lz3n4dy5pz9y6kw00v1rly47g2g6hi95nj6a6hib3z0";
+       version = "1.4.1.1";
+       sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -69873,8 +70196,8 @@ self: {
        pname = "diagrams-gtk";
        version = "1.4";
        sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn";
-       revision = "2";
-       editedCabalFile = "0hblrqvwk1pbssaci97v36r71kpm7kkcghh5ijmq52lmjfq72jqm";
+       revision = "3";
+       editedCabalFile = "0k0i3nm5zpdmrqh8wmd8y5xhw7drd67hifdva5a7dih8w5sab4ra";
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib gtk
        ];
@@ -73212,8 +73535,8 @@ self: {
      }:
      mkDerivation {
        pname = "doclayout";
-       version = "0.2.0.1";
-       sha256 = "0f6zfb0f4m71irc8wknkdk6xylgncsahhl7ga7rzpr4pxy3bnqak";
+       version = "0.3";
+       sha256 = "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl safe text ];
        testHaskellDepends = [
@@ -73298,7 +73621,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "doctemplates_0_8" = callPackage
+  "doctemplates_0_8_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
      , tasty, tasty-golden, tasty-hunit, temporary, text
@@ -73306,8 +73629,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.8";
-       sha256 = "0zhnhdpbh0cyh6nr655yfik135gssa1qhfhzsvaph2n1qwq1l6nn";
+       version = "0.8.1";
+       sha256 = "02xysm510m3hbifwb7ngx39wj1ycxjrws4ngnm0d7ywqm9cv1hbb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers doclayout filepath HsYAML mtl parsec safe
@@ -79140,6 +79463,8 @@ self: {
        pname = "equeue";
        version = "0";
        sha256 = "14risb13sv4mz5scyhcvg6knb791lx4b9jm3k9189fhxkr5a28cc";
+       revision = "1";
+       editedCabalFile = "0i8gjfmi6jbfbmqs9yckzg694mp7v92b1m99r1hn1yw3xbizvf2j";
        libraryHaskellDepends = [
          base containers contravariant mtl semigroups stm
        ];
@@ -83191,8 +83516,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.0.3";
-       sha256 = "07ys208iiy28hmhc098yx2vj3rzwwxqi0q7l4xx4q61albmryf08";
+       version = "0.24.0.4";
+       sha256 = "1jpqc48a7h9x64wv77g7bdnhvfjgbabp4n3qcbqsfz9v92j46j0a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -89443,8 +89768,8 @@ self: {
     ({ mkDerivation, base, bytestring, process-extras, text }:
      mkDerivation {
        pname = "fromhtml";
-       version = "1.0.1";
-       sha256 = "173rbbnn62mb7kxlv7g9r52gjqi07pj3kqd7h2qr8mhk4xlbbagy";
+       version = "1.0.4";
+       sha256 = "1pavyjpda8x5dc7g018yipz6hc329n6yfi5lbvnvc7fa3r77dvs9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring process-extras text ];
@@ -92381,6 +92706,18 @@ self: {
        broken = true;
      }) {};
 
+  "generic-lens-lite" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "generic-lens-lite";
+       version = "0.1";
+       sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Monomorphic field lens like with generic-lens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-lucid-scaffold" = callPackage
     ({ mkDerivation, base, lucid, text }:
      mkDerivation {
@@ -92430,6 +92767,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-optics-lite" = callPackage
+    ({ mkDerivation, base, generic-lens-lite, optics-core }:
+     mkDerivation {
+       pname = "generic-optics-lite";
+       version = "0.1";
+       sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi";
+       libraryHaskellDepends = [ base generic-lens-lite optics-core ];
+       testHaskellDepends = [ base optics-core ];
+       description = "Monomorphic field opics like with generic-lens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-pretty" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , tasty, tasty-hunit, text, vector
@@ -94314,15 +94663,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib_8_8_1_20191204" = callPackage
+  "ghc-lib_8_8_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
      , hpc, pretty, process, time, transformers, unix
      }:
      mkDerivation {
        pname = "ghc-lib";
-       version = "8.8.1.20191204";
-       sha256 = "1xj2l9w4jmwxavs5s6p50wciracqlvkx9mg015m8gv1s8sxn6sqh";
+       version = "8.8.2";
+       sha256 = "0dsb41vk9agywzw7nayraq9hhi95vz6aw9yz8jgggh1an4vkg833";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -94353,15 +94702,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser_8_8_1_20191204" = callPackage
+  "ghc-lib-parser_8_8_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
      , process, time, transformers, unix
      }:
      mkDerivation {
        pname = "ghc-lib-parser";
-       version = "8.8.1.20191204";
-       sha256 = "0acfq70mhhb76v0fhgqnijb4yp4njzxwc3c6d53r594cix3grvdp";
+       version = "8.8.2";
+       sha256 = "0q9pxdwmzm5hr6snpbkn1d3165h0lrdncgid5aqffqwz2hc1d2z0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -98451,8 +98800,10 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.33.1";
-       sha256 = "0vzrx0904s8r7srld4c3wkw3j0rx3l6jszz3m5friwkdwfs60a83";
+       version = "2.34";
+       sha256 = "1nmkwzifch01pnzxn3rm0gvxq9xvwvxkvqfwsdsj6zjmiz68w3ca";
+       revision = "1";
+       editedCabalFile = "13dm3cc5m7g7qhpasq2jbzm7x4dizjipjdsy5amghglrs8m0r90y";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -98620,6 +98971,8 @@ self: {
        pname = "gloss";
        version = "1.13.1.1";
        sha256 = "1bmjwd2vfbxfypr2g23810yyp921m30wxbb6f3m0wkk65iypjnls";
+       revision = "1";
+       editedCabalFile = "1bcjm3issssqxd60jd2y6032y8plcs0sm3wbnha1f6fa3z46z9n0";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -98794,6 +99147,8 @@ self: {
        pname = "gloss-rendering";
        version = "1.13.1.1";
        sha256 = "1pkzm7zzfdya8cz3h66akx8785h3vxbnyb815liw4nilvwg01d9x";
+       revision = "1";
+       editedCabalFile = "10x83cpxp6yrmamjg4kjm3pzlhh6zj2rdw686py0vcx0jrjy3qg7";
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
@@ -99134,6 +99489,8 @@ self: {
        pname = "gnuplot";
        version = "0.5.6";
        sha256 = "1g6xgnlkh17avivn1rlq7l2nvs26dvrbx4rkfld0bf6kyqaqwrgp";
+       revision = "1";
+       editedCabalFile = "15ydlmw9a6dfiy0ffxqxy7iiszbysqn2jlhxrh4lfi21ck9n15kq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -99146,6 +99503,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gnuplot_0_5_6_1" = callPackage
+    ({ mkDerivation, array, base, containers, data-accessor
+     , data-accessor-transformers, deepseq, filepath, process
+     , semigroups, temporary, time, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "gnuplot";
+       version = "0.5.6.1";
+       sha256 = "1rfq94lnsyjr8y9p5r56jpllv3p8rvh9xxzjji016b6r5adi8cnb";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base containers data-accessor data-accessor-transformers
+         deepseq filepath process semigroups temporary time transformers
+         utility-ht
+       ];
+       description = "2D and 3D plots using gnuplot";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gnutls" = callPackage
     ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers
      }:
@@ -108320,8 +108699,10 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.2.1.0";
-       sha256 = "1lk2rr48hcf8wdci1aj8xcybyh1nm2dmqi25vj23gj7lq4fir5cs";
+       version = "0.3.2.0";
+       sha256 = "0jaw7s82l0nsr1axqkngcc4wfnmh790jdqbnsknwvyk6anvbpacb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
        description = "Hanabi card game";
        license = stdenv.lib.licenses.bsd3;
@@ -113464,6 +113845,37 @@ self: {
        broken = true;
      }) {};
 
+  "haskoin-core_0_10_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
+     , cereal, conduit, containers, cryptonite, deepseq, entropy
+     , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
+     , network, QuickCheck, safe, scientific, secp256k1-haskell, split
+     , string-conversions, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haskoin-core";
+       version = "0.10.0";
+       sha256 = "0gb9z0ncy7ff93k41yvbj0i33akpk5vcm477ydpn7sandq3m40nv";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bytestring cereal conduit
+         containers cryptonite deepseq entropy hashable hspec HUnit memory
+         mtl murmur3 network QuickCheck safe scientific secp256k1-haskell
+         split string-conversions text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cereal containers deepseq hspec HUnit mtl
+         QuickCheck safe split string-conversions text unordered-containers
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bitcoin & Bitcoin Cash library for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "haskoin-crypto" = callPackage
     ({ mkDerivation, base, binary, byteable, bytestring, containers
      , cryptohash, haskoin-util, HUnit, mtl, QuickCheck, test-framework
@@ -113498,8 +113910,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.9.14";
-       sha256 = "17nd6spm2bskgnxp2v7jfb66ds2qgxzhzlvd4yhgbf63kqfhlkjl";
+       version = "0.9.15";
+       sha256 = "0bdyqqhxjbz3lqj5q7cg9w9i40xvp9p9185g3dlhqn598s65mppx";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -113576,8 +113988,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.19.3";
-       sha256 = "0r7kckbkjb1y4dlz1byh3q1xnkysb8361gydvzk6dwbb4fmzld1p";
+       version = "0.19.5";
+       sha256 = "1pxplfipl4n6vq8s8al0acfrxnbpf8yhya6hpfymszfbvcyqkhl8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115346,6 +115758,8 @@ self: {
        pname = "haxr";
        version = "3000.11.3.1";
        sha256 = "1wyb848mb0b6idkbi5jarsf6qi1zzl3yh6xd05g228kykii8k9mg";
+       revision = "1";
+       editedCabalFile = "1g5vqgpk02kx502w0klps88i0h0mfwmb8ai14xm5b90jmd9kndn3";
        libraryHaskellDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -121123,8 +121537,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.16.1";
-       sha256 = "1dw04sjgji6iprs0hqxr0nynkg5qsqh20l0d48vqjkgaral4sxma";
+       version = "1.16.2";
+       sha256 = "1jvvmj13n3xv575g5zxfq2nw9bk719yb6ivddxfaf36h10zqpdxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121249,10 +121663,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.9";
-       sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq";
-       revision = "3";
-       editedCabalFile = "1c06v50lhhzsa4872j9khqvga7pvfrvns8sp3srn9vfwxbiw5x7z";
+       version = "1.3.10";
+       sha256 = "0kdrdbvs5qi8hc807d245xrv589hgx5aly5syb6zk62pi1kf92s3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121326,8 +121738,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.16.1";
-       sha256 = "14rwigcmal1dy286qnw93nnn4rl42hgcnz882wmjmhpyjrs4l5ig";
+       version = "1.16.2";
+       sha256 = "0b3b68560jszx8frmv8q9bxs1nc33n9c52ns1gcy3a3j3s80ww3g";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -121380,8 +121792,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.16.1";
-       sha256 = "0cn1pwr87lvi65m619v845vj17v27hp3h6fcgy1cpb4gjsdvq861";
+       version = "1.16.2";
+       sha256 = "1bsg48i9fmml4ga8jg1ikxig30dn7x5i8qbzbd9nr9lz5wg9xxlh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121427,8 +121839,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.16.1";
-       sha256 = "1mn3mk4v6akbzl2hc8k89q4njffxpj832h5pywy9rj2mc7fbw5s5";
+       version = "1.16.2";
+       sha256 = "1kipq8b1df1iyp0dsdkbmshzdgii1993kb72drqsbl4ihj6vd96s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121528,8 +121940,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.2.6";
-       sha256 = "0943qnx9c8b1ach233f435qq5830b6g5vqfq3yy8qdagpwi3vpn1";
+       version = "2.2.7";
+       sha256 = "0qcqpw880436n2jdil12hp071mgzvknjflkx1j01fk3hbyn4hqmx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -123595,19 +124007,18 @@ self: {
 
   "hookup" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HsOpenSSL
-     , HsOpenSSL-x509-system, network, openssl
+     , HsOpenSSL-x509-system, network
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.3";
-       sha256 = "08a10bmnr15bb6pdcq4hq3z4595spsq3g8879apcqb6qgbs6dlxb";
+       version = "0.3.0.1";
+       sha256 = "12jwjgbbdiyffy78b90a2jcz1vz1mfsrmgj0q4w3ly3zl79j2la9";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
-       librarySystemDepends = [ openssl ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = stdenv.lib.licenses.isc;
-     }) {inherit (pkgs) openssl;};
+     }) {};
 
   "hoopl" = callPackage
     ({ mkDerivation, base, containers, filepath, mtl, parsec
@@ -124617,8 +125028,8 @@ self: {
     ({ mkDerivation, base, bytestring, unix, word8 }:
      mkDerivation {
        pname = "hpath-filepath";
-       version = "0.10.0";
-       sha256 = "0s83ym61sg24z8d5fbmvb5divvr9a05bgx0w66clfqwzi8pi3mxs";
+       version = "0.10.1";
+       sha256 = "16hrcd0qdidggsafm11x3h1b3gyqwf77bav9vyvli5mi8b5ha8n5";
        libraryHaskellDepends = [ base bytestring unix word8 ];
        description = "ByteString based filepath manipulation";
        license = stdenv.lib.licenses.bsd3;
@@ -124626,16 +125037,16 @@ self: {
 
   "hpath-io" = callPackage
     ({ mkDerivation, base, bytestring, hpath, hpath-filepath, hspec
-     , HUnit, IfElse, process, streamly, unix, unix-bytestring
-     , utf8-string
+     , HUnit, IfElse, process, safe-exceptions, streamly, unix
+     , unix-bytestring, utf8-string
      }:
      mkDerivation {
        pname = "hpath-io";
-       version = "0.10.0";
-       sha256 = "01p0118chixajafiiihh8cvpmk9h4jvvpgzynr8ci63zx8x8s3bd";
+       version = "0.10.1";
+       sha256 = "10bhgcw55xs5y58khi67y881v560x3wnp74d67d8qkk64afx36xz";
        libraryHaskellDepends = [
-         base bytestring hpath hpath-filepath IfElse streamly unix
-         unix-bytestring utf8-string
+         base bytestring hpath hpath-filepath IfElse safe-exceptions
+         streamly unix unix-bytestring utf8-string
        ];
        testHaskellDepends = [
          base bytestring hpath hspec HUnit IfElse process unix
@@ -127788,6 +128199,27 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "hsinstall_2_6" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, Cabal, directory, filepath
+     , heredoc, optparse-applicative, process, safe-exceptions
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hsinstall";
+       version = "2.6";
+       sha256 = "0763jzyl8ysani30alc6ii3i68i5ls1cd288b6iza4lfz1knval5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base Cabal directory filepath heredoc
+         optparse-applicative process safe-exceptions transformers
+       ];
+       description = "Install Haskell software";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hskeleton" = callPackage
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
@@ -132220,8 +132652,8 @@ self: {
     ({ mkDerivation, base, bytestring, deepseq, ghc, text }:
      mkDerivation {
        pname = "humble-prelude";
-       version = "0.1";
-       sha256 = "019zj48h3daa8yvzcdpg4j9zr252mx384hyif330d8xhp8kpfzvb";
+       version = "0.2";
+       sha256 = "0pzfhp65afkdc33pjbxzcf68c02w6nq8sxqspfwbn78dghg9cbrn";
        libraryHaskellDepends = [ base bytestring deepseq ghc text ];
        description = "Redefinition-free prelude alternative";
        license = stdenv.lib.licenses.bsd3;
@@ -132496,6 +132928,22 @@ self: {
        broken = true;
      }) {};
 
+  "hurl" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, http-client
+     , http-client-tls, http-types, network-uri, text
+     }:
+     mkDerivation {
+       pname = "hurl";
+       version = "1.0.0.0";
+       sha256 = "13yh9n7h3ihdxfi69w5jww7l9xan8yy1l4ijf198sw03sfq52k9l";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring http-client http-client-tls
+         http-types network-uri text
+       ];
+       description = "Haskell URL resolver";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hurriyet" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, here, hspec
      , http-client, http-client-tls, mtl, text
@@ -132931,6 +133379,8 @@ self: {
        pname = "hw-dsv";
        version = "0.4.0";
        sha256 = "1cpjfq3z4q5wmnlaskrzxhyybb07andc7gli7vv7njm9552bwyvf";
+       revision = "2";
+       editedCabalFile = "167zvbxwjmb25xmhcdhrshk03b98kh5ldrf2b6a4v8xlkj4p33qm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137209,8 +137659,8 @@ self: {
      }:
      mkDerivation {
        pname = "incremental";
-       version = "0.1";
-       sha256 = "03yax3xkp1mlipi1vn97ljz05c6fxflpvz9myqvlxcj658p9f3kh";
+       version = "0.1.1";
+       sha256 = "17lwakfa7xh0rdxr4hixlqy9hldvz06hcsclw3kln7m4iv4843d7";
        libraryHaskellDepends = [
          aeson base containers deepseq extensible semigroups text
        ];
@@ -137641,6 +138091,24 @@ self: {
        broken = true;
      }) {};
 
+  "infernal" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , containers, exceptions, heart-app, heart-core, http-client
+     , http-types, mtl, text, unliftio, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "infernal";
+       version = "0.3.0";
+       sha256 = "0iixw8np4rh66ql2lm2gkhz9yzkgxw0mch3gxsflqi0a96y2jcik";
+       libraryHaskellDepends = [
+         aeson base binary bytestring case-insensitive containers exceptions
+         heart-app heart-core http-client http-types mtl text unliftio
+         unordered-containers wai
+       ];
+       description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "infernu" = callPackage
     ({ mkDerivation, base, containers, digits, either, fgl
      , language-ecmascript, mtl, optparse-applicative, parsec
@@ -140108,10 +140576,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.7.1";
-       sha256 = "0syhcb1q9j68pcxzbv45pah6bkfvnqjzkpzn2356ci7jpb9qpbbn";
-       revision = "2";
-       editedCabalFile = "1g85hhzjqv3fp9704p6hc09vhclk1wr56b7ih46ryfkclqlgfcm6";
+       version = "2.7.2";
+       sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -142675,6 +143141,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json_0_10" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
+     , pretty, syb, text
+     }:
+     mkDerivation {
+       pname = "json";
+       version = "0.10";
+       sha256 = "1fjnd2r4gl2hfqx158db3cn3rsyin4ch7rf9scb2hcy90cy6l10c";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl parsec pretty syb text
+       ];
+       description = "Support for serialising Haskell to and from JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-alt" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
@@ -148549,6 +149031,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-puppet_1_4_6_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , 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.6.1";
+       sha256 = "0w1ffflnzlcwfc4zhn1zlrdhapdniy67wy0z2pa6qgkvxv52rlxd";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         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 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 scientific strict-base-types temporary text transformers
+         unordered-containers vector
+       ];
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -149856,6 +150382,8 @@ self: {
        pname = "learn-physics";
        version = "0.6.4";
        sha256 = "06f1p3rcb37lh0miih2c697w8jiciby3qgjcbjagmf91svx25mm0";
+       revision = "2";
+       editedCabalFile = "0q1m0nfqjb46r2drisk4w3pggmxlx1f391lhvh8bk0z3w1ih4lmy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150740,14 +151268,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lenz_0_4_1_0" = callPackage
+  "lenz_0_4_2_0" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, hs-functors
      , transformers
      }:
      mkDerivation {
        pname = "lenz";
-       version = "0.4.1.0";
-       sha256 = "110a41iig3s273j7z2cpdahnnkbq1f5rswra33ag3w2x9sqry5yj";
+       version = "0.4.2.0";
+       sha256 = "13yz9lxxll928knxjgvdxdbnv911pxkd9d5jly1hdnhyymahv6lf";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors transformers
        ];
@@ -151115,8 +151643,8 @@ self: {
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "2.1.3.2";
-       sha256 = "1z934rl8dm4ncp7qs6kqm2hiir41k5ysrpp44nb6rgzs8f8x46mr";
+       version = "2.2.0.1";
+       sha256 = "0lf7l5wk7hm1s9kkr18bvcm7nqwwhbkas0ycnlk4gz4c6qwbnbz3";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -155310,25 +155838,25 @@ self: {
   "log4hs" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
      , criterion, data-default, directory, filepath, generic-lens, hspec
-     , hspec-core, lens, process, QuickCheck, template-haskell, text
-     , time, vformat, yaml
+     , hspec-core, lens, mtl, process, QuickCheck, template-haskell
+     , text, time, vformat, yaml
      }:
      mkDerivation {
        pname = "log4hs";
-       version = "0.4.0.0";
-       sha256 = "1k4xl8496mrgr9h1m3zsa41xcxywb3z134jisjg8lbzx37mh0zb1";
+       version = "0.6.0.0";
+       sha256 = "11lprcp066hxrgc7945lzprwffwkkd1sl1p3fa3qzw8xb6qi5nhz";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
-         generic-lens lens template-haskell text time vformat yaml
+         generic-lens lens mtl template-haskell text time vformat yaml
        ];
        testHaskellDepends = [
          aeson aeson-qq base bytestring containers data-default directory
-         filepath generic-lens hspec hspec-core lens process QuickCheck
+         filepath generic-lens hspec hspec-core lens mtl process QuickCheck
          template-haskell text time vformat yaml
        ];
        benchmarkHaskellDepends = [
          aeson aeson-qq base bytestring containers criterion data-default
-         directory filepath generic-lens lens template-haskell text time
+         directory filepath generic-lens lens mtl template-haskell text time
          vformat yaml
        ];
        description = "A python logging style log library";
@@ -158845,8 +159373,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "maquinitas-tidal";
-       version = "0.1.0";
-       sha256 = "1gdbcjhcdgk1jx674rbh4lr1xbcks18xiygywsh3pv846wh3m0n6";
+       version = "0.2.1";
+       sha256 = "14j4469yl1ypw97m33r2v37mlqxa689ish84k7ggwjdqxj9f64n2";
        libraryHaskellDepends = [ base ];
        description = "library for MIDI control of hardware";
        license = stdenv.lib.licenses.mit;
@@ -159823,6 +160351,26 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "matrix-market-attoparsec_0_1_0_9" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory
+     , exceptions, hspec, QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "matrix-market-attoparsec";
+       version = "0.1.0.9";
+       sha256 = "0nfmn611x8yyw34xsz6nz7rsmc83211yydf7ic5icq5b598amg9s";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring exceptions scientific
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec QuickCheck
+       ];
+       description = "Parsing and serialization functions for the NIST Matrix Market format";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -159889,8 +160437,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.5.0";
-       sha256 = "0ahlsyk21zm0h1ri0jwlhmqv90myn8x5xhjhpqxafsyjj8vhanpw";
+       version = "50200.6.0";
+       sha256 = "0b8qsd2w324sxmp3cgnz7fzlbhk5nz6slw8qxxm5dpy0bs5v7xnb";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -159927,8 +160475,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "50200.2.0";
-       sha256 = "1c0d2djv3a374k9avbg95sm2f22bhz8ssafw76dnphkk7yasr8h6";
+       version = "50200.3.0";
+       sha256 = "1d5nxaf382lzsr05rcby9w8y726bsda29w46b96p89whfbq8s9h3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159951,8 +160499,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "50200.2.0";
-       sha256 = "0wryvjx9s5p1gvvkp1kzdfgrvwrmfpy81caqc85p6mwnr18ybrbq";
+       version = "50200.3.0";
+       sha256 = "14111sq1k7iw8yy050805x0m80i9mixgxaqkl15gm0pvm4ap5ycd";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -163948,8 +164496,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7h";
-       version = "0.4.1.0";
-       sha256 = "0i7gpq32zsfdbkq5yydban70g4r16b8z9c1f5hlf0mid57zvmy9v";
+       version = "0.5.1.0";
+       sha256 = "0hrkk5fnknjb6871frf6g2j896vbbbyhhxph4ay3f82s4vyh4zvs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163970,8 +164518,8 @@ self: {
     ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }:
      mkDerivation {
        pname = "mmsyn7l";
-       version = "0.2.0.0";
-       sha256 = "1x1yk5c51wrr1nrcq76msgc1g4rrh2lghbzhz8xh5z0a2qdich1s";
+       version = "0.2.3.0";
+       sha256 = "1i9va9ynk4iihvgm5ivdf9pnjc7md2crdfkyww3a709ff416v60x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ];
@@ -164006,8 +164554,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7ukr";
-       version = "0.6.1.1";
-       sha256 = "15gj44ij2hc1mrlminb7fzg502x2fa2w34k0p9k45hl77l961m49";
+       version = "0.6.3.0";
+       sha256 = "1q831acj5a3c0dxlhy2gqci2925p6szz29c90q0nfs8psp58lz42";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167892,6 +168440,146 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "mu-avro" = callPackage
+    ({ mkDerivation, aeson, avro, base, bytestring, containers
+     , mu-schema, sop-core, tagged, template-haskell, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "mu-avro";
+       version = "0.1.0.0";
+       sha256 = "1g5083vwd0s7h27r8l8mdrqwbflq89cgm1660cd1nd29vypwz55x";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson avro base bytestring containers mu-schema sop-core tagged
+         template-haskell text unordered-containers vector
+       ];
+       executableHaskellDepends = [ avro base bytestring mu-schema ];
+       description = "Avro serialization support for Mu microservices";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-grpc-client" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, http2
+     , http2-client, http2-client-grpc, http2-grpc-proto3-wire
+     , mu-protobuf, mu-rpc, mu-schema, sop-core, stm, stm-chans
+     , stm-conduit, template-haskell, text, th-abstraction
+     }:
+     mkDerivation {
+       pname = "mu-grpc-client";
+       version = "0.1.0.0";
+       sha256 = "00i6z413dknh71dnzy61wcgkcwczj74042glsag8193pr1kxa3s6";
+       libraryHaskellDepends = [
+         async base bytestring conduit http2 http2-client http2-client-grpc
+         http2-grpc-proto3-wire mu-protobuf mu-rpc mu-schema sop-core stm
+         stm-chans stm-conduit template-haskell text th-abstraction
+       ];
+       description = "gRPC clients from Mu definitions";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-grpc-server" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit
+     , http2-grpc-proto3-wire, http2-grpc-types, mtl, mu-protobuf
+     , mu-rpc, mu-schema, sop-core, stm, stm-conduit, wai, warp
+     , warp-grpc, warp-tls
+     }:
+     mkDerivation {
+       pname = "mu-grpc-server";
+       version = "0.1.0.1";
+       sha256 = "0f494cn3x1v6hdmyf7w97hvhlvichw70pz9jza232rv7ds6bq38j";
+       revision = "1";
+       editedCabalFile = "0g1qs1ydjy0yn2997il049ldb303gvjvc1pn7j161zb31zlc699m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring conduit http2-grpc-proto3-wire
+         http2-grpc-types mtl mu-protobuf mu-rpc mu-schema sop-core stm
+         stm-conduit wai warp warp-grpc warp-tls
+       ];
+       executableHaskellDepends = [
+         async base bytestring conduit http2-grpc-proto3-wire
+         http2-grpc-types mtl mu-protobuf mu-rpc mu-schema sop-core stm
+         stm-conduit wai warp warp-grpc warp-tls
+       ];
+       description = "gRPC servers for Mu definitions";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-persistent" = callPackage
+    ({ mkDerivation, base, monad-logger, mu-schema, persistent
+     , resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "mu-persistent";
+       version = "0.1.0.0";
+       sha256 = "16y1d69zwfrv2wdx0xj1aavhkfv5z6bg9wvzj29215k1vcvarx7i";
+       libraryHaskellDepends = [
+         base monad-logger mu-schema persistent resourcet transformers
+       ];
+       description = "Utilities for interoperation between Mu and Persistent";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-protobuf" = callPackage
+    ({ mkDerivation, base, bytestring, compendium-client, http-client
+     , http2-grpc-proto3-wire, language-protobuf, mu-rpc, mu-schema
+     , proto3-wire, servant-client-core, sop-core, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "mu-protobuf";
+       version = "0.1.0.0";
+       sha256 = "1vlsq45cjkll4y9fjgjnvp1d9ax850zxy9rawprcrnwc48wmpdxz";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring compendium-client http-client
+         http2-grpc-proto3-wire language-protobuf mu-rpc mu-schema
+         proto3-wire servant-client-core sop-core template-haskell text
+       ];
+       executableHaskellDepends = [
+         base bytestring mu-schema proto3-wire text
+       ];
+       description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-rpc" = callPackage
+    ({ mkDerivation, base, conduit, mtl, mu-schema, sop-core
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "mu-rpc";
+       version = "0.1.0.0";
+       sha256 = "1hinkmhgp49sl7d00iz20p9maf47almii9000hfkszyqbq1dh58p";
+       libraryHaskellDepends = [
+         base conduit mtl mu-schema sop-core template-haskell text
+       ];
+       description = "Protocol-independent declaration of services and servers";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "mu-schema" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, sop-core
+     , template-haskell, text, th-abstraction, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "mu-schema";
+       version = "0.1.0.0";
+       sha256 = "0yqm70w5xbzlcgqdwywfr0qncxlzi9z3nshs8x06shd0g0gjgmhy";
+       libraryHaskellDepends = [
+         aeson base bytestring containers sop-core template-haskell text
+         th-abstraction unordered-containers vector
+       ];
+       description = "Format-independent schemas for serialization";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "mucipher" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169084,6 +169772,27 @@ self: {
        broken = true;
      }) {};
 
+  "musicScroll" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, dbus, gi-gtk
+     , gi-gtk-hs, gtk3, req, stm, tagsoup, text
+     }:
+     mkDerivation {
+       pname = "musicScroll";
+       version = "0.1.0.0";
+       sha256 = "1k0di4xiv1jbfdcbwgqf3cn71fn8351lhhd82nv9cj6h3pmphxvd";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         async base bytestring containers dbus gi-gtk gi-gtk-hs req stm
+         tagsoup text
+       ];
+       executableHaskellDepends = [ base ];
+       executablePkgconfigDepends = [ gtk3 ];
+       description = "Supply your tunes info without leaving your music player";
+       license = stdenv.lib.licenses.gpl3;
+     }) {inherit (pkgs) gtk3;};
+
   "musicbrainz-email" = callPackage
     ({ mkDerivation, aeson, amqp, base, blaze-builder, bytestring
      , configurator, errors, ghc-prim, heist, HTTP, HUnit, mime-mail
@@ -172603,12 +173312,12 @@ self: {
      }) {};
 
   "network-run" = callPackage
-    ({ mkDerivation, base, network }:
+    ({ mkDerivation, base, bytestring, network }:
      mkDerivation {
        pname = "network-run";
-       version = "0.2.1";
-       sha256 = "0fviap6njppdw1dv9dy5027q37kz93w3vdzij0wgp4jp284qcc1f";
-       libraryHaskellDepends = [ base network ];
+       version = "0.2.2";
+       sha256 = "1znf2pafcg1gcrb3yyc69h6y5mb8hilibr5khcwil09i5djsjyxx";
+       libraryHaskellDepends = [ base bytestring network ];
        description = "Simple network runner library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173529,8 +174238,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "0.2.0.0";
-       sha256 = "16d1akwdn7w6g4qpa3mz0wb0prwf3wsv9clllbqdg66mk830dznh";
+       version = "0.2.1.0";
+       sha256 = "0xka55h7c5zqyb8nj1pyq0iq50yfwy4p6fspya1zbi0yjblnxnsa";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base64 bytestring containers ede
          enclosed-exceptions http-client http-types ngx-export
@@ -173762,8 +174471,8 @@ self: {
      }:
      mkDerivation {
        pname = "niv";
-       version = "0.2.11";
-       sha256 = "1llgfcrj4cayjga84dmn35xkaf8rckxpqrxqf4gagff9fpis96gs";
+       version = "0.2.12";
+       sha256 = "0lbkc49ddkxb6x3miimcd2c4ajwf7d9z0hay54n0gmz7d92ha8q0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178998,8 +179707,8 @@ self: {
      }:
      mkDerivation {
        pname = "ormolu";
-       version = "0.0.2.0";
-       sha256 = "10p3h98k5ph2awmdd89k8knavv4npvdmh00a9nrzaw6z32j0igfh";
+       version = "0.0.3.0";
+       sha256 = "04s48k3w4lgi682q8cllhmmawffl2781hi462gkcjr18kx46swx1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -179917,6 +180626,23 @@ self: {
        broken = true;
      }) {pam = null;};
 
+  "pan-os-syslog" = callPackage
+    ({ mkDerivation, base, byteslice, bytesmith, chronos, gauge, ip
+     , primitive, primitive-addr, run-st
+     }:
+     mkDerivation {
+       pname = "pan-os-syslog";
+       version = "0.1.0.0";
+       sha256 = "0ydydbql0pgd6vp9zvzjf0qzsprjaicz9vffrrp3z1xgmfynh70r";
+       libraryHaskellDepends = [
+         base byteslice bytesmith chronos ip primitive primitive-addr run-st
+       ];
+       testHaskellDepends = [ base byteslice primitive ];
+       benchmarkHaskellDepends = [ base byteslice gauge primitive ];
+       description = "Parse syslog traffic from PAN-OS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "panda" = callPackage
     ({ mkDerivation, base, cgi, containers, data-default, directory
      , filepath, gravatar, haskell98, hcheat, kibro, MissingH, mps
@@ -182493,6 +183219,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "password_0_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, QuickCheck
+     , quickcheck-instances, scrypt, text
+     }:
+     mkDerivation {
+       pname = "password";
+       version = "0.1.0.1";
+       sha256 = "0n96n9kiiij6pf587y21v39c2zh9r4n4yd6n2k8km770k3bg1skr";
+       libraryHaskellDepends = [ base scrypt text ];
+       testHaskellDepends = [
+         base bytestring doctest QuickCheck quickcheck-instances
+       ];
+       description = "plain-text password and hashed password datatypes and functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "password-instances" = callPackage
     ({ mkDerivation, aeson, base, doctest, http-api-data, password
      , persistent, QuickCheck, quickcheck-instances
@@ -182511,6 +183254,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "password-instances_0_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, doctest, http-api-data, password
+     , persistent, QuickCheck, quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "password-instances";
+       version = "0.3.0.1";
+       sha256 = "03x9ky018r1ihl4ajc1fcw78g8h1vk3dzr4gjqck78jsb8kj7l93";
+       libraryHaskellDepends = [
+         aeson base http-api-data password persistent
+       ];
+       testHaskellDepends = [
+         base doctest QuickCheck quickcheck-instances
+       ];
+       description = "typeclass instances for password package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "passwords" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -184674,10 +185436,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.9.0.1";
-       sha256 = "08pcx9hn461ww12ziq4fxnxn01pv9rpgmz6lmxk0qpxagp0jfk85";
-       revision = "1";
-       editedCabalFile = "14x751hns0h0ykjhlncm7d5p9dzll7r0rvpafh1kz4149r8566xl";
+       version = "2.9.0.2";
+       sha256 = "0q78y1ydsvm0jrsi211zq789vy50czhskwq13plv6l2h4860917v";
        libraryHaskellDepends = [
          aeson base bson bytestring cereal conduit http-api-data mongoDB
          network path-pieces persistent resource-pool resourcet text time
@@ -184876,7 +185636,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-postgresql_2_10_1_1" = callPackage
+  "persistent-postgresql_2_10_1_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, fast-logger, hspec, hspec-expectations, HUnit
      , monad-logger, persistent, persistent-qq, persistent-template
@@ -184886,8 +185646,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.10.1.1";
-       sha256 = "075msvfvi3f1ac002cd3mvj075c16ffvh6k2syls7kcpgy1z7r9v";
+       version = "2.10.1.2";
+       sha256 = "1q7n0h16argvpw2y3f8mxzmvy24q6if46ab9nvybviki283zbvlb";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          persistent postgresql-libpq postgresql-simple resource-pool
@@ -185173,7 +185933,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_8_0" = callPackage
+  "persistent-template_2_8_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, deepseq-generics, file-embed, hspec, http-api-data
      , monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -185182,8 +185942,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.8.0";
-       sha256 = "16yjrl0gh4jbs4skr7iv6a55lny59bqhd6hjmvch1cl9j5d0c0g3";
+       version = "2.8.0.1";
+       sha256 = "0chgzq70ss8b9hkq0v6zi2kdqsbj3xxcl485ajmwrxclkz1f8c3n";
        libraryHaskellDepends = [
          aeson base bytestring containers http-api-data monad-control
          monad-logger path-pieces persistent template-haskell text
@@ -190935,6 +191695,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-migration_0_1_15_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+     , directory, hspec, postgresql-simple, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-migration";
+       version = "0.1.15.0";
+       sha256 = "0j6nhyknxlmpl0yrdj1pifw1fbb24080jgg64grnhqjwh1d44dvd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple text time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
+       description = "PostgreSQL Schema Migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-named" = callPackage
     ({ mkDerivation, base, bytestring, doctest, Glob, hspec, mtl
      , postgresql-simple, resource-pool, text, transformers
@@ -191821,12 +192605,14 @@ self: {
      }) {};
 
   "predicate-transformers" = callPackage
-    ({ mkDerivation, adjunctions, base, lens, mtl }:
+    ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }:
      mkDerivation {
        pname = "predicate-transformers";
-       version = "0.6.0.0";
-       sha256 = "0m1dgkfbw4prhccllpdm7h99shp2554f1bvi0s950qa2k3mvz9l4";
-       libraryHaskellDepends = [ adjunctions base lens mtl ];
+       version = "0.7.0.2";
+       sha256 = "0wkd7xz3d4sifx9cxm9rnjskhxrbdyqpdspi0sa6jr1ckmq25zpf";
+       revision = "1";
+       editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0";
+       libraryHaskellDepends = [ adjunctions base deepseq lens mtl ];
        description = "A library for writing predicates and transformations over predicates in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192485,15 +193271,15 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
      }) {};
 
-  "pretty-simple_3_2_0_0" = callPackage
+  "pretty-simple_3_2_1_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
      , containers, criterion, doctest, Glob, mtl, QuickCheck
      , template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "3.2.0.0";
-       sha256 = "0jbxyjiyshbc5q5avbmm5ms8n8m0zm540gl3x7vz8k22pcb65jv8";
+       version = "3.2.1.0";
+       sha256 = "01cnvfn2y7qgp9pc9ra9glmgs64f1m8bxa8n31yy8jlkwwmyhly6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -192711,6 +193497,17 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "prettyprinter-graphviz" = callPackage
+    ({ mkDerivation, base, graphviz, prettyprinter, text }:
+     mkDerivation {
+       pname = "prettyprinter-graphviz";
+       version = "0.1.0.1";
+       sha256 = "1h6jr4vh60j54ajsylh41y0iskz5yjgh2879v25z1mw7vfi40kww";
+       libraryHaskellDepends = [ base graphviz prettyprinter text ];
+       description = "a prettyprinter backend for graphviz";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prettyprinter-vty" = callPackage
     ({ mkDerivation, base, prettyprinter, vty }:
      mkDerivation {
@@ -196098,6 +196895,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pure-zlib_0_6_7" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring
+     , bytestring-builder, containers, filepath, fingertree, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "pure-zlib";
+       version = "0.6.7";
+       sha256 = "1ddj88zk94gqqhxiyvkachvhwi5n2la4pfaf5vppkc9ma7sjhyhn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base base-compat bytestring bytestring-builder containers
+         fingertree
+       ];
+       executableHaskellDepends = [ base base-compat bytestring ];
+       testHaskellDepends = [
+         base base-compat bytestring filepath HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base base-compat bytestring time ];
+       description = "A Haskell-only implementation of zlib / DEFLATE";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pureMD5" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, crypto-api
      , crypto-api-tests, pretty-hex, QuickCheck, tagged, test-framework
@@ -200269,14 +201092,14 @@ self: {
      }:
      mkDerivation {
        pname = "raven-haskell";
-       version = "0.1.2.1";
-       sha256 = "1mzz7z99a2agivwypcl62y68vpmihyh6rvy79w1jd29n1l2p621x";
+       version = "0.1.3.0";
+       sha256 = "0jd0xxrliqc85mifkqzblc3fi6xjgkwkqxijqjx42r5jc0m1qs7f";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit mtl network random resourcet
          text time unordered-containers uuid
        ];
        testHaskellDepends = [
-         aeson base bytestring hspec unordered-containers
+         aeson base bytestring hspec time unordered-containers
        ];
        description = "Haskell client for Sentry logging service";
        license = stdenv.lib.licenses.mit;
@@ -202621,6 +203444,40 @@ self: {
        broken = true;
      }) {};
 
+  "reflex-fsnotify" = callPackage
+    ({ mkDerivation, base, fsnotify, reflex }:
+     mkDerivation {
+       pname = "reflex-fsnotify";
+       version = "0.1.0.0";
+       sha256 = "1rj1mk5i3a74i5wjwqwbh5546vjqw97laswg4lkiihkq9w20dlry";
+       libraryHaskellDepends = [ base fsnotify reflex ];
+       description = "reflex-frp interface for watching files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "reflex-ghci" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, fsnotify
+     , optparse-applicative, process, reflex, reflex-fsnotify
+     , reflex-process, reflex-vty, regex-tdfa, text, unix, vty
+     }:
+     mkDerivation {
+       pname = "reflex-ghci";
+       version = "0.1.2.0";
+       sha256 = "13wilfk6d8s201jyifm1ynw8d9ziizaldhg8g9vjvj0j9sxiv1ma";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath fsnotify process reflex
+         reflex-fsnotify reflex-process reflex-vty regex-tdfa text unix
+       ];
+       executableHaskellDepends = [
+         base optparse-applicative process reflex reflex-process reflex-vty
+         text vty
+       ];
+       description = "A GHCi widget library for use in reflex applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reflex-gloss" = callPackage
     ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex
      , transformers
@@ -202720,6 +203577,26 @@ self: {
        broken = true;
      }) {};
 
+  "reflex-process" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , process, reflex, reflex-vty, text, unix, vty
+     }:
+     mkDerivation {
+       pname = "reflex-process";
+       version = "0.1.0.1";
+       sha256 = "0v7xiax45ax2z6w0b4sprc171pv9fkbld7warmk0phwr3sfzb9ai";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring data-default process reflex unix
+       ];
+       executableHaskellDepends = [
+         base containers data-default process reflex reflex-vty text vty
+       ];
+       description = "reflex-frp interface for running shell commands";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reflex-sdl2" = callPackage
     ({ mkDerivation, async, base, containers, dependent-sum
      , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm
@@ -202766,8 +203643,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-vty";
-       version = "0.1.2.1";
-       sha256 = "0l0hpsxg2hjg0446pk34ip24zx8lv6jmr63hizpxjr3vspiff5g0";
+       version = "0.1.3.0";
+       sha256 = "1200svlgpy4zqdfarx1b8n64vgskb9jl00p548ya4pwi0bsv95y7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202906,26 +203783,29 @@ self: {
 
   "refurb" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, classy-prelude
-     , composite-base, composite-opaleye, dlist, fast-logger, hspec
-     , lens, monad-logger, old-locale, opaleye, optparse-applicative
-     , postgresql-simple, process, product-profunctors, template-haskell
-     , text, these, thyme, vector-space
+     , composite-base, composite-opaleye, dlist, exceptions, fast-logger
+     , hspec, lens, monad-control, monad-logger, old-locale, opaleye
+     , optparse-applicative, postgresql-simple, process
+     , product-profunctors, template-haskell, text, these, these-lens
+     , thyme, transformers-base, vector-space
      }:
      mkDerivation {
        pname = "refurb";
-       version = "0.2.2.0";
-       sha256 = "0qnlkpi8hc6a1xf094zf675i4ap3gymxirdmbkdwjq8j54w3lkhl";
+       version = "0.2.3.0";
+       sha256 = "09p9i0l59f34k12pbxvi50bxpj2d864n96fr79mq41xm0bhygsjb";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring classy-prelude composite-base
-         composite-opaleye dlist fast-logger lens monad-logger old-locale
-         opaleye optparse-applicative postgresql-simple process
-         product-profunctors template-haskell text these thyme vector-space
+         composite-opaleye dlist exceptions fast-logger lens monad-control
+         monad-logger old-locale opaleye optparse-applicative
+         postgresql-simple process product-profunctors template-haskell text
+         these these-lens thyme transformers-base vector-space
        ];
        testHaskellDepends = [
          ansi-wl-pprint base bytestring classy-prelude composite-base
-         composite-opaleye dlist fast-logger hspec lens monad-logger
-         old-locale opaleye optparse-applicative postgresql-simple process
-         product-profunctors template-haskell text these thyme vector-space
+         composite-opaleye dlist exceptions fast-logger hspec lens
+         monad-control monad-logger old-locale opaleye optparse-applicative
+         postgresql-simple process product-profunctors template-haskell text
+         these these-lens thyme transformers-base vector-space
        ];
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
@@ -203138,8 +204018,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-do";
-       version = "3.2";
-       sha256 = "0ywp64hifikr5wa0spcg7wl2grrfshyiax25pxzs7hk6xrjais57";
+       version = "3.2.1";
+       sha256 = "1jng0vmdvgwysfw71klgfzx6hs18v64q17had9j2kkg82w6fivqw";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-pcre stringsearch tagged
          text
@@ -207106,6 +207986,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio_0_1_13_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
+     , process, QuickCheck, text, time, typed-process, unix, unliftio
+     , unliftio-core, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rio";
+       version = "0.1.13.0";
+       sha256 = "1jsrblk451ayf5smplngxmch73pf4r0qanafyyfn0g5wyh6hsxcm";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable microlens mtl primitive process text time typed-process
+         unix unliftio unliftio-core unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable hspec microlens mtl primitive process QuickCheck text time
+         typed-process unix unliftio unliftio-core unordered-containers
+         vector
+       ];
+       description = "A standard library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rio-orphans" = callPackage
     ({ mkDerivation, base, exceptions, fast-logger, hspec
      , monad-control, monad-logger, resourcet, rio, transformers-base
@@ -207706,14 +208612,14 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rocksdb-query_0_3_0" = callPackage
+  "rocksdb-query_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, data-default
      , hspec, resourcet, rocksdb-haskell, unliftio
      }:
      mkDerivation {
        pname = "rocksdb-query";
-       version = "0.3.0";
-       sha256 = "0fy7d9m9g0jwssjgkhyg2d170s7mp7g9kz73zgnnp0xgl6mpxrsi";
+       version = "0.3.1";
+       sha256 = "072l4f5xb5prsbs7d7j12mwxy0rlrsnqf6w7g09xmq7n3mz0sv0f";
        libraryHaskellDepends = [
          base bytestring cereal conduit resourcet rocksdb-haskell unliftio
        ];
@@ -209027,8 +209933,8 @@ self: {
     ({ mkDerivation, base, primitive, primitive-unlifted }:
      mkDerivation {
        pname = "run-st";
-       version = "0.1.0.0";
-       sha256 = "0gy5qkq8g7azfp170nsvbfdmj4k058zzfz6imvm2yvbqsny6i77a";
+       version = "0.1.1.0";
+       sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf";
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
        license = stdenv.lib.licenses.bsd3;
@@ -211455,22 +212361,22 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "science-constants";
-       version = "0.2.0.0";
-       sha256 = "0qp3d9la929kks2b2pyylgznl86gy91lp3zgpb9bn7gas3wll9vy";
+       version = "0.2.0.2";
+       sha256 = "0h60pdq3r32wl9h49i08iq496yf0qwvd0qmlmnk9jy5x3zcdwjmd";
        libraryHaskellDepends = [ base ];
        description = "Mathematical/physical/chemical constants";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "science-constants-dimensional" = callPackage
-    ({ mkDerivation, base, dimensional, numtype, science-constants }:
+    ({ mkDerivation, base, dimensional, numtype-dk, science-constants
+     }:
      mkDerivation {
        pname = "science-constants-dimensional";
-       version = "0.1.0.2";
-       sha256 = "13yz9c8d52fdrkz23f064s0pp9cc2941qfcfz6b0g4c6f6a0wqkm";
+       version = "0.1.0.3";
+       sha256 = "05svn307q46cskw1ywkkp1b0ym9jcn48dzjij9mvkg5g6gvsbcg4";
        libraryHaskellDepends = [
-         base dimensional numtype science-constants
+         base dimensional numtype-dk science-constants
        ];
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
@@ -212758,6 +213664,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {libsecp256k1 = null;};
 
+  "secp256k1-haskell_0_1_8" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , deepseq, entropy, hashable, hspec, hspec-discover, HUnit
+     , libsecp256k1, mtl, QuickCheck, string-conversions
+     }:
+     mkDerivation {
+       pname = "secp256k1-haskell";
+       version = "0.1.8";
+       sha256 = "0ymmgcvlw4wrmnn0r6nmmpk0djihpappiywwfxvmnq8brqdkf3jk";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cereal deepseq entropy hashable
+         QuickCheck string-conversions
+       ];
+       libraryPkgconfigDepends = [ libsecp256k1 ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cereal deepseq entropy hashable
+         hspec HUnit mtl QuickCheck string-conversions
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bindings for secp256k1 library from Bitcoin Core";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {libsecp256k1 = null;};
+
   "secp256k1-legacy" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
      , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
@@ -213131,8 +214061,8 @@ self: {
      }:
      mkDerivation {
        pname = "semantic-source";
-       version = "0.0.0.1";
-       sha256 = "0w1iwd67dpvpc43g4x9q686sljrxv6xhx9rlgiw6kzcdil7fcm8z";
+       version = "0.0.1.0";
+       sha256 = "0zzybqys2vc2i06ggkbzcd8b2s68j3qpsrds55p0cvd9ng4dlvgi";
        libraryHaskellDepends = [
          aeson base bytestring deepseq generic-monoid hashable semilattices
          text
@@ -216516,21 +217446,21 @@ self: {
 
   "servant-to-elm" = callPackage
     ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm
-     , http-types, protolude, servant, text
+     , http-types, protolude, servant, servant-multipart, text
      }:
      mkDerivation {
        pname = "servant-to-elm";
-       version = "0.2.0.0";
-       sha256 = "0kj42y6jb5cqylkvj0iwm857vliagfgbh7rgyzbrgz834r7n5cri";
+       version = "0.3.0.0";
+       sha256 = "1s241rjgr8hwkrnvalx23nbyg3gdi3v5nsdfz2lys4b24wyafg5p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bound elm-syntax haskell-to-elm http-types protolude
-         servant text
+         servant servant-multipart text
        ];
        testHaskellDepends = [
          aeson base bound elm-syntax haskell-to-elm http-types protolude
-         servant text
+         servant servant-multipart text
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -218556,8 +219486,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.3.4.2";
-       sha256 = "123dv5mjj7nah9mm5yfgwv6ga5lwh4d9xi01zskm3z0ia4fdxs85";
+       version = "0.3.4.3";
+       sha256 = "1cn3kh5rszyis2pqvh3s35zlchxwyf7vssd8md9z8vgqs6apd49r";
        libraryHaskellDepends = [
          base bytestring directory filepath process temporary transformers
          unix
@@ -218574,10 +219504,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate-extras";
-       version = "0.3.4.1";
-       sha256 = "0bmqz4k2wcdv2669w053xm4990fdyghqq35m5kwnrbwr9qwn5pgk";
-       revision = "1";
-       editedCabalFile = "11x8alavql8375misc8zry4sz73bz3hxqydmbk9hsymgvkdm51y6";
+       version = "0.3.4.3";
+       sha256 = "1aqc0bslqwrfr8b9nkk52n3fjw2b91gnn7pzzp24smm1cbm2x50d";
        libraryHaskellDepends = [
          base bytestring feed http-conduit http-types mime-types shellmate
          tagsoup text utf8-string xml
@@ -221259,6 +222187,8 @@ self: {
        pname = "skip-var";
        version = "0.1.1.0";
        sha256 = "07nljfjd45fagisd99pqz2jhznfapk9cgd9lyy9cija7pmxfbg5z";
+       revision = "1";
+       editedCabalFile = "0vl2y19l7xhlq08f91ggycj4imfdxvkj2fsaz8ifc0waxk3q7ja8";
        libraryHaskellDepends = [ base ];
        description = "Skip variables";
        license = stdenv.lib.licenses.mit;
@@ -221891,6 +222821,8 @@ self: {
        pname = "small-bytearray-builder";
        version = "0.3.1.0";
        sha256 = "1swv0cwsxrmffkvx16qxxxkxfhqfwxwfz7d2msp5fzzz6all6vli";
+       revision = "1";
+       editedCabalFile = "16kslqf3zwqvjk3hhf1s3hb1xkhz0nk2a9n59fwbwqxqrbxy4kdb";
        libraryHaskellDepends = [
          base byteslice bytestring natural-arithmetic primitive
          primitive-offset run-st text-short wide-word
@@ -229774,15 +230706,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_46_0" = callPackage
+  "stratosphere_0_47_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.46.0";
-       sha256 = "07qm0bi5f3fkpnbsjbyi4qv2kp7w0wb7zd75q4cikjwkm1wxlldr";
+       version = "0.47.0";
+       sha256 = "04917xnc2hs613xi8d2mj3z2miyrrdmbywcmasg7ffcs2vxig48q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -231616,6 +232548,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "structured-cli_2_6_0_0" = callPackage
+    ({ mkDerivation, base, data-default, exceptions, haskeline, mtl
+     , split, transformers
+     }:
+     mkDerivation {
+       pname = "structured-cli";
+       version = "2.6.0.0";
+       sha256 = "1g0yq5kxidmh4x0izvspafhhir64krw986s0a5rkbvkjk7ahvm7y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default exceptions haskeline mtl split transformers
+       ];
+       executableHaskellDepends = [ base data-default mtl split ];
+       description = "Application library for building interactive console CLIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "structured-haskell-mode" = callPackage
     ({ mkDerivation, base, descriptive, ghc-prim, haskell-src-exts
      , text
@@ -231841,8 +232792,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylist";
-       version = "1.1.0.0";
-       sha256 = "1sgfyslbsppndgbywlqynzfxd63y6vr9mig6d76czh427qvn7qpp";
+       version = "1.1.1.0";
+       sha256 = "0adcw26540a8srlmypjdv41icw5d3j3i2q6i7j92hhssj642bfw4";
        libraryHaskellDepends = [
          base css-syntax hashable network-uri text unordered-containers
        ];
@@ -235758,8 +236709,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe, text }:
      mkDerivation {
        pname = "tamper";
-       version = "0.4.2.2";
-       sha256 = "0jzx76k1bd47ag3y73xmhi7yw7abr5hk9gy95gv3y7knb6mj9cdl";
+       version = "0.4.2.3";
+       sha256 = "0im6m05lj6nfap6qqff9qmb8vvv4i3g17pcqdg6rqb2xx86dfnjj";
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "Blaze-style HTML templates as a Monad Transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -236020,8 +236971,8 @@ self: {
      }:
      mkDerivation {
        pname = "taskell";
-       version = "1.9.0.0";
-       sha256 = "14fvvk0a0i0giq5ab8nhkimxhnfhwbqadgjh6p6xvrnm8qikkqg1";
+       version = "1.9.1.0";
+       sha256 = "07hkkx71xb6k89ylis58lcv69ab1avggb4347ppzv2wxp6qljn5l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -236252,8 +237203,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "1.0.0.1";
        sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz";
-       revision = "1";
-       editedCabalFile = "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn";
+       revision = "2";
+       editedCabalFile = "0zrp7njdx69pvhf1lg4fv3p962qfsm2z3qk09h0jhxmfj5ishnhs";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -236262,6 +237213,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hedgehog_1_0_0_2" = callPackage
+    ({ mkDerivation, base, hedgehog, tagged, tasty
+     , tasty-expected-failure
+     }:
+     mkDerivation {
+       pname = "tasty-hedgehog";
+       version = "1.0.0.2";
+       sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5";
+       libraryHaskellDepends = [ base hedgehog tagged tasty ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-expected-failure
+       ];
+       description = "Integration for tasty and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-hedgehog-coverage" = callPackage
     ({ mkDerivation, base, containers, hedgehog, mtl, tagged, tasty
      , tasty-expected-failure, tasty-hedgehog, text, transformers
@@ -240990,6 +241958,26 @@ self: {
        license = "GPL";
      }) {};
 
+  "threaded" = callPackage
+    ({ mkDerivation, async, base, chan, extractable-singleton, hashable
+     , monad-control-aligned, mtl, stm, tmapmvar
+     }:
+     mkDerivation {
+       pname = "threaded";
+       version = "0.0.0";
+       sha256 = "1f7zvigy2gwj0dsxfs4m07ng4k4l29i6mccjnvqz0b45gsm1b4fj";
+       libraryHaskellDepends = [
+         async base chan extractable-singleton hashable
+         monad-control-aligned mtl stm tmapmvar
+       ];
+       testHaskellDepends = [
+         async base chan extractable-singleton hashable
+         monad-control-aligned mtl stm tmapmvar
+       ];
+       description = "Manage concurrently operating threads without having to spark them";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "threadmanager" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -245404,8 +246392,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.7.2.0";
-       sha256 = "1gq30qjywg6cgbzgxxfngkn5c4kbddnij7wdvz8x7k1yb13ra0hd";
+       version = "0.8.0.0";
+       sha256 = "14hb5ss2iwkbipyl7yvchhajs6wli2pfw85zs5qb1yzaxxx78qml";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
          semantic-source split template-haskell text unordered-containers
@@ -245424,8 +246412,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-go";
-       version = "0.4.0.0";
-       sha256 = "0i469134jc1i665nr5j3z3al8lgsv74mm5x7rk4gm159kpfm1z1r";
+       version = "0.4.1.0";
+       sha256 = "1a41r2fdmwc7yyqnhfc3y38krklm9s9sn5mbc4lpf2595pqv0ggg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
@@ -245464,8 +246452,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-java";
-       version = "0.6.0.0";
-       sha256 = "1jz740pj2ihmkf06ixii93msfn40lh5mky3qc5bvwk5xqf4ai716";
+       version = "0.6.1.0";
+       sha256 = "07zyj3diaq2nrlvxbhbrad1wha2705v5d9kf51vmhxknybdxp5sf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
@@ -245482,19 +246470,26 @@ self: {
      }) {tree-sitter-test-helpers = null;};
 
   "tree-sitter-json" = callPackage
-    ({ mkDerivation, base, template-haskell, text, tree-sitter }:
+    ({ mkDerivation, base, bytestring, hedgehog, pathtype, tasty
+     , tasty-hedgehog, tasty-hunit, template-haskell, text, tree-sitter
+     , tree-sitter-test-helpers
+     }:
      mkDerivation {
        pname = "tree-sitter-json";
-       version = "0.5.0.0";
-       sha256 = "1mq1v81d00l80pg6mji9w1g464hxvgv28djnxany5vy2g38ns7q9";
+       version = "0.6.0.0";
+       sha256 = "0n7rq5a8kjrgr7d7fbhjxybrbgwxr2c8d2wyr80yp27vilvf4lh6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell text tree-sitter ];
+       testHaskellDepends = [
+         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+         text tree-sitter tree-sitter-test-helpers
+       ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for JSON";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {};
+     }) {tree-sitter-test-helpers = null;};
 
   "tree-sitter-php" = callPackage
     ({ mkDerivation, base, template-haskell, tree-sitter }:
@@ -245513,20 +246508,21 @@ self: {
      }) {};
 
   "tree-sitter-python" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath
-     , hedgehog, pathtype, semantic-source, tasty, tasty-hedgehog
-     , tasty-hunit, template-haskell, text, tree-sitter
-     , tree-sitter-test-helpers
+    ({ mkDerivation, base, bytestring, gauge, hedgehog, pathtype
+     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
      }:
      mkDerivation {
        pname = "tree-sitter-python";
-       version = "0.8.0.0";
-       sha256 = "08a698qqjck0nml11nrgyzvgrjbkanyvfv0x0bqng0w3mjk62yf0";
+       version = "0.8.1.0";
+       sha256 = "0sjrml57dc9fsjmh555hjsckb05x9pz3lzk970hmm2cfwgnifvyi";
+       isLibrary = true;
+       isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base directory filepath semantic-source template-haskell
-         tree-sitter
+         base semantic-source template-haskell tree-sitter
        ];
+       executableHaskellDepends = [ base bytestring gauge tree-sitter ];
        testHaskellDepends = [
          base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
          text tree-sitter tree-sitter-test-helpers
@@ -245539,18 +246535,23 @@ self: {
      }) {tree-sitter-test-helpers = null;};
 
   "tree-sitter-ruby" = callPackage
-    ({ mkDerivation, base, bytestring, hedgehog, pathtype
-     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
+    ({ mkDerivation, base, bytestring, gauge, Glob, hedgehog, lens
+     , pathtype, semantic-source, tasty, tasty-hedgehog, tasty-hunit
      , template-haskell, text, tree-sitter, tree-sitter-test-helpers
      }:
      mkDerivation {
        pname = "tree-sitter-ruby";
-       version = "0.4.0.0";
-       sha256 = "1y26956bryax1n17yf49hqczcig1qd5fk5j39arj93464x142ba9";
+       version = "0.4.1.0";
+       sha256 = "1kb87c1z9jghidygk632lihlqkqbanx48dvpdqxn7ypnni4dzw0k";
+       isLibrary = true;
+       isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
        ];
+       executableHaskellDepends = [
+         base bytestring gauge Glob lens pathtype tree-sitter
+       ];
        testHaskellDepends = [
          base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
          text tree-sitter tree-sitter-test-helpers
@@ -245569,8 +246570,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.4.0.0";
-       sha256 = "0q5v1fm9ia83074gkamz06hlcmdkd4vabjfrjqcra7mrvrj1pqa2";
+       version = "0.4.1.0";
+       sha256 = "0bznbbg8yj1qd5z4bqjxf8y4jjbb8w2d68xzmbp66rjbw7nzcs60";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
@@ -245593,8 +246594,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.4.0.0";
-       sha256 = "0sbvsfipwf2j809kkjcgbqq4k44h69x9dl07dvngjyfimkccv758";
+       version = "0.4.1.0";
+       sha256 = "0p53vi3mjmln5mrmsv6w43jbdlcjywq61qm4911w3qqwmwjbgn14";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
@@ -246024,6 +247025,30 @@ self: {
        broken = true;
      }) {};
 
+  "tropical-geometry" = callPackage
+    ({ mkDerivation, algebra, base, containers, criterion, gloss
+     , hlint-test, lens, matrix, numeric-prelude, semiring-simple
+     , singletons, sized, tasty, tasty-hspec, tasty-hunit, type-natural
+     }:
+     mkDerivation {
+       pname = "tropical-geometry";
+       version = "0.0.0.1";
+       sha256 = "12qcfb98yzm0ijnpzjqp3z20i0vvlpvfy4gpz7a001q8sgchd182";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         algebra base containers gloss lens matrix numeric-prelude
+         semiring-simple singletons sized type-natural
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hlint-test tasty tasty-hspec tasty-hunit
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "A Tropical Geometry package for Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "true-name" = callPackage
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
@@ -249133,8 +250158,8 @@ self: {
     ({ mkDerivation, base, bytestring, posix-paths, systemd, unix }:
      mkDerivation {
        pname = "udev";
-       version = "0.1.0.0";
-       sha256 = "1a5i57f50scxbv5snn4xd953bx98qq3cgzhxjnqvxyazqz3h1fx2";
+       version = "0.1.1.0";
+       sha256 = "1sb0bdi221gr58cv2b24izs02wd28fr4jijsbpw8r5gzia2j4wf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
@@ -255902,6 +256927,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-app-static_3_1_7_1" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, cryptonite, directory, file-embed, filepath, hspec
+     , http-date, http-types, memory, mime-types, mockery, network
+     , old-locale, optparse-applicative, template-haskell, temporary
+     , text, time, transformers, unix-compat, unordered-containers, wai
+     , wai-extra, warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.7.1";
+       sha256 = "10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers cryptonite
+         directory file-embed filepath http-date http-types memory
+         mime-types old-locale optparse-applicative template-haskell text
+         time transformers unix-compat unordered-containers wai wai-extra
+         warp zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         mockery network old-locale temporary text time transformers
+         unix-compat wai wai-extra zlib
+       ];
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-cli" = callPackage
     ({ mkDerivation, ansi-terminal, base, http-types, iproute
      , monads-tf, network, options, socket-activation, stm
@@ -256220,6 +257279,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-handler-launch_3_0_3" = callPackage
+    ({ mkDerivation, async, base, bytestring, http-types, process
+     , streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.3";
+       sha256 = "1416vx2gnllyrz8vrzq1x6in9ypa1wgxwqyh5zqbb9rfwbb83ha5";
+       libraryHaskellDepends = [
+         async base bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -257790,7 +258866,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_3_6" = callPackage
+  "warp_3_3_7" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -257800,8 +258876,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.6";
-       sha256 = "0ldby1rinf6awqhgda72hyvff5pid4lgb9d0kgdxdm5v4qrcvcpd";
+       version = "3.3.7";
+       sha256 = "1145nbrd6gzr0qhd7vgf5vdhs22xd9z1h9cr2jbs77r6kqypzy3v";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -262802,8 +263878,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit-stylist";
-       version = "1.0.0.0";
-       sha256 = "1w9ig4mr0l0kj8mk7sfsyv8p77k91l93cfpbpvmg32q9wffz2r02";
+       version = "1.0.1.0";
+       sha256 = "1csa940r6a63i01khcm89lvhp7m6dyxpnljn6l6m105z7jfvvy8r";
        libraryHaskellDepends = [
          base containers css-syntax network-uri stylist text
          unordered-containers xml-conduit
@@ -264005,6 +265081,53 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xrefcheck" = callPackage
+    ({ mkDerivation, aeson, aeson-options, async, autoexporter
+     , base-noprelude, bytestring, cmark-gfm, containers, data-default
+     , deepseq, directory, directory-tree, filepath, fmt, Glob, hspec
+     , hspec-discover, http-client, http-types, lens, loot-prelude, mtl
+     , o-clock, optparse-applicative, pretty-terminal, QuickCheck, req
+     , roman-numerals, template-haskell, text, text-metrics
+     , th-lift-instances, th-utilities, yaml
+     }:
+     mkDerivation {
+       pname = "xrefcheck";
+       version = "0.1.0.0";
+       sha256 = "1ap5pdgbvf9zjwbwi3i46jdizm1ggzpknpmmic22kbw8rdv2i9yr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-options async base-noprelude bytestring cmark-gfm
+         containers data-default deepseq directory directory-tree filepath
+         fmt Glob http-client http-types lens loot-prelude mtl o-clock
+         optparse-applicative pretty-terminal req roman-numerals
+         template-haskell text text-metrics th-lift-instances th-utilities
+         yaml
+       ];
+       libraryToolDepends = [ autoexporter ];
+       executableHaskellDepends = [
+         aeson aeson-options async base-noprelude bytestring cmark-gfm
+         containers data-default deepseq directory directory-tree filepath
+         fmt Glob http-client http-types lens loot-prelude mtl o-clock
+         optparse-applicative pretty-terminal req roman-numerals
+         template-haskell text text-metrics th-lift-instances th-utilities
+         yaml
+       ];
+       executableToolDepends = [ autoexporter ];
+       testHaskellDepends = [
+         aeson aeson-options async base-noprelude bytestring cmark-gfm
+         containers data-default deepseq directory directory-tree filepath
+         fmt Glob hspec http-client http-types lens loot-prelude mtl o-clock
+         optparse-applicative pretty-terminal QuickCheck req roman-numerals
+         template-haskell text text-metrics th-lift-instances th-utilities
+         yaml
+       ];
+       testToolDepends = [ autoexporter hspec-discover ];
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {loot-prelude = null;};
+
   "xsact" = callPackage
     ({ mkDerivation, array, base, containers, directory, process
      , random, unix
@@ -264800,16 +265923,17 @@ self: {
 
   "yaml2owl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, network
-     , swish, text, xml, yaml
+     , network-uri, swish, text, xml, yaml
      }:
      mkDerivation {
        pname = "yaml2owl";
-       version = "0.0.1";
-       sha256 = "1yz7cq6xbxjh3j5hljrzla7dpgsa2ag4ywbvc6ynf7bpikdymq65";
+       version = "0.0.2";
+       sha256 = "1d3vnpmqzsia1cwg17vl98n8bx6l3yjl4w4rhxm64xfgizwvjgwc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers directory filepath network swish text xml yaml
+         base containers directory filepath network network-uri swish text
+         xml yaml
        ];
        description = "Generate OWL schema from YAML syntax, and an RDFa template";
        license = "LGPL";
@@ -268575,8 +269699,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "408.0";
-       sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53";
+       version = "408.1";
+       sha256 = "1r54d289rdfvxqk0774hhh0x2kj8zsh7graahqwwp76r911jb8bp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers transformers ];

From 672880966f318dc19d8c545021bf31f060c9f001 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:07:47 +0100
Subject: [PATCH 122/755] haskell-ghc-lib-parser: update to latest version for
 hlint

---
 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 f28bf4bb7075..0132d03c70be 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1239,7 +1239,7 @@ self: super: {
   constraints-deriving = dontCheck super.constraints-deriving;
 
   # need newer version of ghc-libparser
-  hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204; };
+  hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
 
   # https://github.com/sol/hpack/issues/366
   hpack = self.hpack_0_33_0;

From 40420dc313c4aafd3ac9e9332bca2d0e3dbfbe79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:06:27 +0100
Subject: [PATCH 123/755] haskell-doctemplates: provide the latest version when
 building pandoc 2.9.x

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2f8767a84387..a72ee71af3ac 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -67,6 +67,8 @@ core-packages:
 # comment saying "# LTS Haskell x.y". Any changes after that commend will be
 # lost the next time `update-stackage.sh` runs.
 default-package-overrides:
+  # pandoc-2.9 does not accept the 0.3 version yet
+  - doclayout < 0.3
   # LTS Haskell 14.20
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
@@ -2512,6 +2514,7 @@ extra-packages:
   - dbus <1                             # for xmonad-0.26
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - dhall == 1.27.0                     # required for spago 0.13.0.  Probably can be removed when next version of spago is available.
+  - doctemplates == 0.8                 # required by pandoc-2.9.x
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock == 2.22.*                   # required on GHC 8.0.x

From 8576e8b2c38e807392beff668080b51f2b99ab21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:26:11 +0100
Subject: [PATCH 124/755] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d1d0ee229831bf9928e884344821c9a27aa4d3d5.
---
 .../haskell-modules/hackage-packages.nix      | 172 ++++++++++++++++--
 1 file changed, 158 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ccd120cfd2ea..9de3c0c31706 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21960,6 +21960,8 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -25086,6 +25088,8 @@ self: {
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-graphs" = callPackage
@@ -28304,6 +28308,8 @@ self: {
        ];
        description = "Generic Haskell AMQP tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp-worker" = callPackage
@@ -31348,6 +31354,8 @@ self: {
        ];
        description = "Arithmetic circuits for zkSNARKs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arithmoi" = callPackage
@@ -34436,6 +34444,8 @@ self: {
        ];
        description = "Tool for decoding avro";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avwx" = callPackage
@@ -70761,6 +70771,8 @@ self: {
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diff-gestalt" = callPackage
@@ -73530,6 +73542,24 @@ self: {
      }) {};
 
   "doclayout" = callPackage
+    ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "doclayout";
+       version = "0.2.0.1";
+       sha256 = "0f6zfb0f4m71irc8wknkdk6xylgncsahhl7ga7rzpr4pxy3bnqak";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base mtl safe text ];
+       testHaskellDepends = [
+         base mtl tasty tasty-golden tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ base criterion mtl text ];
+       description = "A prettyprinting library for laying out text documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "doclayout_0_3" = callPackage
     ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden
      , tasty-hunit, text
      }:
@@ -73545,6 +73575,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion mtl text ];
        description = "A prettyprinting library for laying out text documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docopt" = callPackage
@@ -73621,6 +73652,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "doctemplates_0_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
+     , tasty, tasty-golden, tasty-hunit, temporary, text
+     , text-conversions, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "doctemplates";
+       version = "0.8";
+       sha256 = "0zhnhdpbh0cyh6nr655yfik135gssa1qhfhzsvaph2n1qwq1l6nn";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base containers doclayout filepath HsYAML mtl parsec safe
+         scientific text text-conversions unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers doclayout filepath Glob tasty
+         tasty-golden tasty-hunit temporary text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion doclayout filepath mtl text
+       ];
+       description = "Pandoc-style document templates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctemplates_0_8_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
@@ -77899,6 +77957,8 @@ self: {
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-syntax" = callPackage
@@ -79142,6 +79202,8 @@ self: {
        ];
        description = "Safe helpers for accessing and modifying environment variables";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "env-locale" = callPackage
@@ -81319,6 +81381,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exception-mailer" = callPackage
@@ -82434,6 +82498,8 @@ self: {
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-sp" = callPackage
@@ -89056,6 +89122,8 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-game" = callPackage
@@ -95648,6 +95716,8 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -96231,6 +96301,8 @@ self: {
        libraryPkgconfigDepends = [ gtk4-x11 ];
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -97543,6 +97615,8 @@ self: {
        ];
        description = "Tool to help resolving git conflicts";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-monitor" = callPackage
@@ -104892,6 +104966,8 @@ self: {
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk" = callPackage
@@ -112432,6 +112508,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -119304,21 +119382,21 @@ self: {
   "hgeometry" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-clist, deepseq, dlist, doctest, doctest-discover, fingertree
-     , fixed-vector, hgeometry-combinatorial, lens, linear, MonadRandom
-     , mtl, QuickCheck, quickcheck-instances, reflection, semigroupoids
-     , semigroups, singletons, template-haskell, text, vector
-     , vector-builder, vinyl, yaml
+     , fixed-vector, hgeometry-combinatorial, hspec, lens, linear
+     , MonadRandom, mtl, primitive, QuickCheck, quickcheck-instances
+     , reflection, semigroupoids, semigroups, template-haskell, text
+     , vector, vector-builder, vinyl, yaml
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.9.0.0";
-       sha256 = "1s9hmknrqdsrfda5l8qjs85qhq6lm8vfkd54dnkbg67xk42z0y1m";
+       version = "0.10.0.0";
+       sha256 = "01kf7cmjdr2s172xj25i9vyjpfd0wayh0bjgccxqqy886kxrkhfw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-clist deepseq
-         dlist fingertree fixed-vector hgeometry-combinatorial lens linear
-         MonadRandom mtl QuickCheck quickcheck-instances reflection
-         semigroupoids semigroups singletons template-haskell text vector
+         dlist fingertree fixed-vector hgeometry-combinatorial hspec lens
+         linear MonadRandom mtl primitive QuickCheck quickcheck-instances
+         reflection semigroupoids semigroups template-haskell text vector
          vector-builder vinyl yaml
        ];
        testHaskellDepends = [ base doctest doctest-discover QuickCheck ];
@@ -119339,13 +119417,13 @@ self: {
      }:
      mkDerivation {
        pname = "hgeometry-combinatorial";
-       version = "0.9.0.0";
-       sha256 = "0c9byfg6x1ch1812s6kf9w1vkrhzffqw6asllhln95f6cvsz58z0";
+       version = "0.10.0.0";
+       sha256 = "0v168wxnzkmylh8gzxzrq0sfq5y2xn3i8r6kqnahc14x1c1jzzk1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers contravariant
          data-clist deepseq dlist fingertree lens MonadRandom mtl QuickCheck
-         quickcheck-instances reflection semigroupoids semigroups singletons
+         quickcheck-instances reflection semigroupoids semigroups
          template-haskell text vector vector-builder vinyl yaml
        ];
        testHaskellDepends = [
@@ -119875,6 +119953,8 @@ self: {
        ];
        description = "Set up a GHC API session";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hie-core" = callPackage
@@ -125054,6 +125134,8 @@ self: {
        ];
        description = "High-level IO operations on files/directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpc_0_6_0_3" = callPackage
@@ -132216,6 +132298,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -132235,6 +132319,8 @@ self: {
        ];
        description = "A command-line http2 client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -132942,6 +133028,8 @@ self: {
        ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurriyet" = callPackage
@@ -138107,6 +138195,8 @@ self: {
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infernu" = callPackage
@@ -138978,6 +139068,8 @@ self: {
        libraryHaskellDepends = [ base containers primitive ];
        description = "Advent of Code 2019 intcode interpreter";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "integer-gmp_1_0_2_0" = callPackage
@@ -151423,6 +151515,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -154975,6 +155069,8 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {llvm-config = null;};
 
   "llvm-hs_9_0_1" = callPackage
@@ -155002,6 +155098,7 @@ self: {
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -157615,8 +157712,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "0.3.0.5";
-       sha256 = "0mlwcchikmiaq6scs48g2snaiwcznwrcfksn4yij4hagjz734rpq";
+       version = "0.3.1.0";
+       sha256 = "0yklxk2hqfc47lh0i347lwbnr54xk5zk2r6yqyckbaqb89k3xw0p";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring directory hspec ];
@@ -168478,6 +168575,8 @@ self: {
        ];
        description = "gRPC clients from Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-grpc-server" = callPackage
@@ -168506,6 +168605,8 @@ self: {
        ];
        description = "gRPC servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-persistent" = callPackage
@@ -168546,6 +168647,8 @@ self: {
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-rpc" = callPackage
@@ -172805,6 +172908,8 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-bsd" = callPackage
@@ -180641,6 +180746,8 @@ self: {
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "panda" = callPackage
@@ -182420,6 +182527,8 @@ self: {
        ];
        description = "Streaming Parquet reader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parse-dimacs" = callPackage
@@ -193506,6 +193615,8 @@ self: {
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "a prettyprinter backend for graphviz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -201914,6 +202025,8 @@ self: {
          base bytestring containers directory hspec text
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-editor" = callPackage
@@ -203453,6 +203566,8 @@ self: {
        libraryHaskellDepends = [ base fsnotify reflex ];
        description = "reflex-frp interface for watching files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
@@ -203476,6 +203591,8 @@ self: {
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -203595,6 +203712,8 @@ self: {
        ];
        description = "reflex-frp interface for running shell commands";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-sdl2" = callPackage
@@ -204030,6 +204149,8 @@ self: {
        ];
        description = "PCRE wrapper";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-easy" = callPackage
@@ -213662,6 +213783,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libsecp256k1 = null;};
 
   "secp256k1-haskell_0_1_8" = callPackage
@@ -213686,6 +213809,7 @@ self: {
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libsecp256k1 = null;};
 
   "secp256k1-legacy" = callPackage
@@ -219803,6 +219927,8 @@ self: {
        isExecutable = true;
        description = "Examples for the shine package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shine-varying" = callPackage
@@ -221440,6 +221566,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -231557,6 +231685,8 @@ self: {
        ];
        description = "Folder watching as a Streamly stream";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamproc" = callPackage
@@ -236052,6 +236182,8 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -242460,6 +242592,8 @@ self: {
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
        description = "A concurrent utility inspired by Ticker in golang";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tickle" = callPackage
@@ -244452,6 +244586,8 @@ self: {
          text unordered-containers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokenify" = callPackage
@@ -247047,6 +247183,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "true-name" = callPackage
@@ -254785,6 +254923,8 @@ self: {
        libraryHaskellDepends = [ base fin lens vec ];
        description = "Vec: length-indexed (sized) list: lens support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vec-optics" = callPackage
@@ -254796,6 +254936,8 @@ self: {
        libraryHaskellDepends = [ base fin optics-core vec ];
        description = "Vec: length-indexed (sized) list: optics support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vect" = callPackage
@@ -258967,6 +259109,8 @@ self: {
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-tls" = callPackage

From 8a5c2f65693abedaade29026748a29569b8992bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:24:57 +0100
Subject: [PATCH 125/755] haskell-tls-session-manager: fix build with ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index ab8966ce5907..7198ed5ff193 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -105,6 +105,7 @@ self: super: {
   skylighting = self.skylighting_0_8_3;
   skylighting-core = self.skylighting-core_0_8_3;
   sop-core = self.sop-core_0_5_0_0;
+  tls-session-manager = self.tls-session-manager_0_0_4;
   texmath = self.texmath_0_12;
   th-desugar = self.th-desugar_1_10;
   tls = self.tls_1_5_3;

From fc1cafab42c7cdee2b6cf414e9e03ba193527fb4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:31:46 +0100
Subject: [PATCH 126/755] haskell-dhall: update overrides for the new release

I dropped the override for dhall-to-cabal, because the package
is marked as broken already.
---
 .../haskell-modules/configuration-common.nix        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0132d03c70be..36c96b959503 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1052,17 +1052,17 @@ self: super: {
   # This raises the lower bound on prettyprinter to 1.5.1 since
   # `removeTrailingWhitespace` is buggy in earlier versions.
   # This will probably be able to be removed when we update to LTS-15.
-  dhall_1_28_0 =
-    dontCheck (super.dhall_1_28_0.override {
+  dhall_1_29_0 =
+    dontCheck (super.dhall_1_29_0.override {
       prettyprinter = self.prettyprinter_1_5_1;
       prettyprinter-ansi-terminal =
         self.prettyprinter-ansi-terminal.override {
           prettyprinter = self.prettyprinter_1_5_1;
         };
     });
-  dhall-bash_1_0_25 = super.dhall-bash_1_0_25.override { dhall = self.dhall_1_28_0; };
-  dhall-json_1_6_0 = super.dhall-json_1_6_0.override {
-    dhall = self.dhall_1_28_0;
+  dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
+  dhall-json_1_6_1 = super.dhall-json_1_6_1.override {
+    dhall = self.dhall_1_29_0;
     prettyprinter = self.prettyprinter_1_5_1;
     prettyprinter-ansi-terminal =
       self.prettyprinter-ansi-terminal.override {
@@ -1228,8 +1228,7 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_28_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_28_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_29_0; };
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11

From 475898160348c60e07d28dc7c69dae16ca4d5dbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 20:52:02 +0100
Subject: [PATCH 127/755] haskell-ormolu: fix override for ghc-lib-parser

---
 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 36c96b959503..5605af97ddcf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1362,7 +1362,7 @@ self: super: {
 
   # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
   ormolu = doJailbreak (super.ormolu.override {
-    ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204;
+    ghc-lib-parser = self.ghc-lib-parser_8_8_2;
   });
 
   # krank-0.1.0 does not accept PyF-0.9.0.0.

From ff84bdcf69eb6c97f5e0b2bb369a83656e4265b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jan 2020 19:41:06 +0100
Subject: [PATCH 128/755] all-cabal-hashes: update to Hackage at
 2020-01-17T18:23:06Z

---
 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 0537a5d53737..d6b5965cca0a 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/477d50a859be91a25b2fed6494d414044d7e71ab.tar.gz";
-  sha256 = "0wzi2wgcp5ykwp4wrhcfdaxlbdzrmlgalparx3ap80q069c8fd0n";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b2812edaaed9f9033e48dfbcd45e7e5fb56daccd.tar.gz";
+  sha256 = "1a2073gknks4r2ibm3ji1wrib6pr3aicg6wjgzsj2r5xgad7jm6g";
 }

From d5d1293fe35b92059f5671a5f27db0c00549bdb0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 17 Jan 2020 21:25:34 +0000
Subject: [PATCH 129/755] nixos/traceroute: init

---
 nixos/modules/module-list.nix         |  1 +
 nixos/modules/programs/traceroute.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/modules/programs/traceroute.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a48434641b0c..88ab3c0c5625 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -152,6 +152,7 @@
   ./programs/system-config-printer.nix
   ./programs/thefuck.nix
   ./programs/tmux.nix
+  ./programs/traceroute.nix
   ./programs/tsm-client.nix
   ./programs/udevil.nix
   ./programs/usbtop.nix
diff --git a/nixos/modules/programs/traceroute.nix b/nixos/modules/programs/traceroute.nix
new file mode 100644
index 000000000000..4eb0be3f0e0b
--- /dev/null
+++ b/nixos/modules/programs/traceroute.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.traceroute;
+in {
+  options = {
+    programs.traceroute = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to configure a setcap wrapper for traceroute.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    security.wrappers.traceroute = {
+      source = "${pkgs.traceroute}/bin/traceroute";
+      capabilities = "cap_net_raw+p";
+    };
+  };
+}

From 15e0b23f489282901de669718150aec44b9f8674 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 17 Jan 2020 16:51:06 -0500
Subject: [PATCH 130/755] signal-desktop: use autoPatchelfHook, wrap properly
 (#77850)

Most prominently we don't use `phases` because of https://github.com/NixOS/nixpkgs/issues/28910.
This is also problematic when using wrapGAppsHook.
In order to use wrapGAppsHook's automatic wrapping
(this was done manually before because there was no fixupPhase)
we need to install signal at lib/Signal instead of just into libexec.
That's because it would try to wrap .so files.
---
 .../signal-desktop/default.nix                | 91 ++++++++++---------
 1 file changed, 48 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index a17bf226fc91..bc41b0236274 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -2,7 +2,8 @@
 , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
 , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
-, cups, expat, udev, libnotify, libuuid, at-spi2-core, libappindicator-gtk3
+, cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3
+, autoPatchelfHook
 # Unfortunately this also overwrites the UI language (not just the spell
 # checking language!):
 , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -21,11 +22,32 @@ let
         --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
         --set LC_MESSAGES "${spellcheckerLanguage}"''
       else "");
-  rpath = lib.makeLibraryPath [
+in stdenv.mkDerivation rec {
+  pname = "signal-desktop";
+  version = "1.29.6"; # Please backport all updates to the stable channel.
+  # All releases have a limited lifetime and "expire" 90 days after the release.
+  # When releases "expire" the application becomes unusable until an update is
+  # applied. The expiration date for the current release can be extracted with:
+  # $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/Signal/resources/app.asar"
+  # (Alternatively we could try to patch the asar archive, but that requires a
+  # few additional steps and might not be the best idea.)
+
+  src = fetchurl {
+    url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
+    sha256 = "1s1rc4kyv0nxz5fy5ia7fflphf3izk80ks71q4wd67k1g9lvcw24";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
     alsaLib
-    atk
     at-spi2-atk
     at-spi2-core
+    atk
     cairo
     cups
     dbus
@@ -36,10 +58,6 @@ let
     glib
     gnome2.GConf
     gtk3
-    pango
-    libappindicator-gtk3
-    libnotify
-    libuuid
     libX11
     libXScrnSaver
     libXcomposite
@@ -51,55 +69,42 @@ let
     libXrandr
     libXrender
     libXtst
+    libappindicator-gtk3
+    libnotify
+    libuuid
     nspr
     nss
-    udev
+    pango
+    systemd
     xorg.libxcb
   ];
 
-in stdenv.mkDerivation rec {
-  pname = "signal-desktop";
-  version = "1.29.6"; # Please backport all updates to the stable channel.
-  # All releases have a limited lifetime and "expire" 90 days after the release.
-  # When releases "expire" the application becomes unusable until an update is
-  # applied. The expiration date for the current release can be extracted with:
-  # $ grep -a "^{\"buildExpiration" "${signal-desktop}/libexec/resources/app.asar"
-  # (Alternatively we could try to patch the asar archive, but that requires a
-  # few additional steps and might not be the best idea.)
-
-  src = fetchurl {
-    url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1s1rc4kyv0nxz5fy5ia7fflphf3izk80ks71q4wd67k1g9lvcw24";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  nativeBuildInputs = [ dpkg wrapGAppsHook ];
+  runtimeDependencies = [
+    systemd.lib
+  ];
 
   unpackPhase = "dpkg-deb -x $src .";
 
+  dontBuild = true;
+  dontConfigure = true;
+  dontPatchELF = true;
+
   installPhase = ''
-    mkdir -p $out
-    cp -R opt $out
+    mkdir -p $out/lib
 
-    mv ./usr/share $out/share
-    mv $out/opt/Signal $out/libexec
-    rmdir $out/opt
-
-    chmod -R g-w $out
-
-    # Patch signal
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
-    wrapProgram $out/libexec/signal-desktop \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \
-      ${customLanguageWrapperArgs} \
-      "''${gappsWrapperArgs[@]}"
+    mv usr/share $out/share
+    mv opt/Signal $out/lib
 
     # Symlink to bin
     mkdir -p $out/bin
-    ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
+    ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }"
+      ${customLanguageWrapperArgs}
+    )
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/signal-desktop.desktop \

From b5e99522b1f3254cec695d8a76b1d18d1637ce83 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 22:57:00 +0100
Subject: [PATCH 131/755] python3.pkgs.binwalk 2.1.1 -> 2.2.0

---
 .../python-modules/binwalk/default.nix        | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index ec613527e92b..97c6b957a437 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -10,24 +10,39 @@
 , p7zip
 , cabextract
 , lzma
+, nose
 , pycrypto
 , pyqtgraph ? null }:
 
-let visualizationSupport = (pyqtgraph != null);
+let
+  visualizationSupport = (pyqtgraph != null);
+  version = "2.2.0";
 in
 buildPythonPackage {
   pname = "binwalk";
-  version = "2.1.1";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "devttys0";
     repo = "binwalk";
-    rev = "291a03595d17f848c73b74cb6ca508da782cd8f7";
-    sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
+    rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b";
+    sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
   };
 
   propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
-    ++ stdenv.lib.optional visualizationSupport pyqtgraph;
+  ++ stdenv.lib.optional visualizationSupport pyqtgraph;
+
+  # setup.py only installs version.py during install, not test
+  postPatch = ''
+    echo '__version__ = "${version}"' > src/binwalk/core/version.py
+  '';
+
+  # binwalk wants to access ~/.config/binwalk/magic
+  preCheck = ''
+    HOME=$(mktemp -d)
+  '';
+
+  checkInputs = [ nose ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/ReFirmLabs/binwalk";

From 1d7c399f892114a01ea2513ed7d941d0c51ddfcc Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 17 Jan 2020 09:09:39 +1000
Subject: [PATCH 132/755] maintainers: add zowoq

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6fc68933d244..f095ff0ef11e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7850,6 +7850,12 @@
     githubId = 1069303;
     name = "Kim Simmons";
   };
+  zowoq = {
+    email = "59103226+zowoq@users.noreply.github.com";
+    github = "zowoq";
+    githubId = 59103226;
+    name = "zowoq";
+  };
   zraexy = {
     email = "zraexy@gmail.com";
     github = "zraexy";

From 531eb30f6bbb9b2dd83e0e16c50037bcba595d06 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 17 Jan 2020 09:11:58 +1000
Subject: [PATCH 133/755] saldl: init at 40

---
 pkgs/tools/networking/saldl/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/networking/saldl/default.nix

diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix
new file mode 100644
index 000000000000..d51e5515bd63
--- /dev/null
+++ b/pkgs/tools/networking/saldl/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, wafHook
+, asciidoc
+, docbook_xml_dtd_45
+, docbook_xsl
+, libxml2
+, libxslt
+, curl
+, libevent
+}:
+
+stdenv.mkDerivation rec {
+  pname = "saldl";
+  version = "40";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "19ajci5h5gdnrvwf0l7xy5s58z2di68rrvcmqpsmpp4lfr37rk2l";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    wafHook
+    asciidoc
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxml2
+    libxslt
+  ];
+
+  buildInputs = [ curl libevent ];
+
+  wafConfigureFlags = [ "--saldl-version ${version}" "--no-werror" ];
+
+  outputs = [ "out" "man" ];
+
+  meta = with stdenv.lib; {
+    description = "CLI downloader optimized for speed and early preview";
+    homepage = "https://saldl.github.io";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ zowoq ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891e984a2482..2413835c9a65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6218,6 +6218,8 @@ in
 
   sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
 
+  saldl = callPackage ../tools/networking/saldl { };
+
   salt = callPackage ../tools/admin/salt {};
 
   salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};

From 63c310c07eb04837130c26bc1149e9a19dd2b559 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 17:12:35 +0100
Subject: [PATCH 134/755] nixos/buildkite-agent: change option meta-data into
 tags attrset

This is called tags in the buildkite 3.
---
 .../continuous-integration/buildkite-agent.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 00b881ffe3c2..3c9c92bf0527 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -74,13 +74,12 @@ in
         '';
       };
 
-      meta-data = mkOption {
-        type = types.str;
-        default = "";
-        example = "queue=default,docker=true,ruby2=true";
+      tags = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = { queue = "default"; docker = "true"; ruby2 ="true"; };
         description = ''
-          Meta data for the agent. This is a comma-separated list of
-          <code>key=value</code> pairs.
+          Tags for the agent.
         '';
       };
 
@@ -211,9 +210,7 @@ in
         ##     don't end up in the Nix store.
         preStart = let
           sshDir = "${cfg.dataDir}/.ssh";
-          metaData = if cfg.meta-data == ""
-            then ""
-            else "meta-data=${cfg.meta-data}";
+          tagStr = lib.concatStringsSep "," (lib.mapAttrsToList (name: value: "${name}=${value}") cfg.tags);
         in
           ''
             mkdir -m 0700 -p "${sshDir}"
@@ -223,8 +220,8 @@ in
             cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
             token="$(cat ${toString cfg.tokenPath})"
             name="${cfg.name}"
-            ${metaData}
             shell="${cfg.shell}"
+            tags="${tagStr}"
             build-path="${cfg.dataDir}/builds"
             hooks-path="${cfg.hooksPath}"
             ${cfg.extraConfig}
@@ -258,5 +255,6 @@ in
     (mkRenamedOptionModule [ "services" "buildkite-agent" "openssh" "privateKeyPath" ] [ "services" "buildkite-agent" "privateSshKeyPath" ])
     (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKey" ]      "SSH public keys aren't necessary to clone private repos.")
     (mkRemovedOptionModule [ "services" "buildkite-agent" "openssh" "publicKeyPath" ]  "SSH public keys aren't necessary to clone private repos.")
+    (mkRenamedOptionModule [ "services" "buildkite-agent" "meta-data"]                 [ "services" "buildkite-agent" "tags" ])
   ];
 }

From b9182529b42dcc5e5edf7efa4a37cd0f98580206 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 17 Jan 2020 18:32:23 +0100
Subject: [PATCH 135/755] nixos/buildkite: add release notes

---
 nixos/doc/manual/release-notes/rl-2003.xml | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 51f91268eff0..b5385f151f59 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -401,6 +401,44 @@ users.users.me =
      the type to <literal>either path (submodule ...)</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <link linkend="opt-services.buildkite-agent.enable">Buildkite Agent</link>
+      module and corresponding packages have been updated to 3.x.
+      While doing so, the following options have been changed:
+    </para>
+    <itemizedlist>
+      <listitem>
+       <para>
+         <literal>services.buildkite-agent.meta-data</literal> has been renamed to
+         <link linkend="opt-services.buildkite-agent.tags">services.buildkite-agent.tags</link>,
+         to match upstreams naming for 3.x.
+         Its type has also changed - it now accepts an attrset of strings.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+         The<literal>services.buildkite-agent.openssh.publicKeyPath</literal> option
+         has been removed, as it's not necessary to deploy public keys to clone private
+         repositories.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+         <literal>services.buildkite-agent.openssh.privateKeyPath</literal>
+         has been renamed to
+         <link linkend="opt-services.buildkite-agent.privateSshKeyPath">buildkite-agent.privateSshKeyPath</link>,
+         as the whole <literal>openssh</literal> now only contained that single option.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+         <link linkend="opt-services.buildkite-agent.shell">services.buildkite-agent.shell</link>
+         has been introduced, allowing to specify a custom shell to be used.
+       </para>
+      </listitem>
+    </itemizedlist>
+   </listitem>
   </itemizedlist>
  </section>
 

From e2df20c2172ac7a948941a03932a4ab0138a9ba4 Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Fri, 17 Jan 2020 19:24:57 -0300
Subject: [PATCH 136/755] clojure-lsp: 20200114T225020 -> 20200117T215443

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

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 50bcd0da8122..f2bb771f217c 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
-  version = "20200114T225020";
+  version = "20200117T215443";
 
   src = fetchurl {
     url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
-    sha256 = "1fx27nz79h1f3gmaw9k33dq9r28s7z8rx6hqpv44368v67d8jbhb";
+    sha256 = "0ccn3700lam5m5yh5hdcm6wkazyr3dhvhyc9bc08basjwk09lfkp";
   };
 
   dontUnpack = true;

From 4f4d792e709aefa6df56f70d8baad330abed32ca Mon Sep 17 00:00:00 2001
From: Alan Hollis <me@alanhollis.com>
Date: Fri, 17 Jan 2020 22:25:35 +0000
Subject: [PATCH 137/755] gns3: Fix python package not being pinned (#77701)

Due to https://github.com/NixOS/nixpkgs/issues/44426 the correct psutils
package is not picked up, this commit changes the code so the correct
version is always picked.
---
 pkgs/applications/networking/gns3/default.nix | 15 ++++++++--
 pkgs/applications/networking/gns3/gui.nix     | 29 +++++++------------
 pkgs/applications/networking/gns3/server.nix  | 28 +++++++-----------
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 71044bd0f181..2dae8377055f 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -7,8 +7,19 @@ let
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
     in args // { inherit version branch; };
-  mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
-  mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
+  extraArgs = {
+    mkOverride = attrname: version: sha256:
+      self: super: {
+        ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
+          inherit version;
+          src = oldAttrs.src.override {
+            inherit version sha256;
+          };
+        });
+      };
+  };
+  mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
+  mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
   guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx";
   serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d";
 in {
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index d978b060aab2..2d462d5c11d0 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -1,25 +1,18 @@
-{ stable, branch, version, sha256Hash }:
+{ stable, branch, version, sha256Hash, mkOverride }:
 
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 
 let
+  # TODO: This package requires qt5Full to launch
+  defaultOverrides = [
+    (mkOverride "psutil" "5.6.3"
+      "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
+    (mkOverride "jsonschema" "2.6.0"
+      "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
+  ];
+
   python = python3.override {
-    packageOverrides = self: super: {
-      psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
-        version = "5.6.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
-        };
-      });
-      jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
-        version = "2.6.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
-        };
-      });
-    };
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
   };
 in python.pkgs.buildPythonPackage rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index d6c6b65846c9..beeac9d02936 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,25 +1,17 @@
-{ stable, branch, version, sha256Hash }:
+{ stable, branch, version, sha256Hash, mkOverride }:
 
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 
 let
+  defaultOverrides = [
+    (mkOverride "psutil" "5.6.3"
+      "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
+    (mkOverride "jsonschema" "2.6.0"
+      "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
+  ];
+
   python = python3.override {
-    packageOverrides = self: super: {
-      psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
-        version = "5.6.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
-        };
-      });
-      jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
-        version = "2.6.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
-        };
-      });
-    };
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
   };
 in python.pkgs.buildPythonPackage {
   pname = "gns3-server";

From 782ea12568bfd03d43ed7b2e823b6d27241d65be Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Jan 2020 23:29:26 +0100
Subject: [PATCH 138/755] zopfli: 1.0.2 -> 1.0.3

---
 pkgs/tools/compression/zopfli/default.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index accead9db0bc..586c47de582c 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -2,32 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "zopfli";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zopfli";
     rev = "${pname}-${version}";
     name = "${pname}-${version}-src";
-    sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y";
+    sha256 = "0dr8n4j5nj2h9n208jns56wglw59gg4qm3s7c6y3hs75d0nnkhm4";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "zopfli-cmake.patch";
-      url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch";
-      sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ];
 
-  installPhase = ''
-    install -D -t $out/bin zopfli*
-    install -d $out/lib
-    cp -d libzopfli* $out/lib
+  postInstall = ''
     install -Dm444 -t $out/share/doc/zopfli ../README*
   '';
 

From ac65998957255aa4b67f771e9889534dcfe2298d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 17 Jan 2020 23:15:16 +0100
Subject: [PATCH 139/755] wabt: 1.0.12 -> 1.0.13

https://github.com/WebAssembly/wabt/releases/tag/1.0.13
---
 pkgs/development/tools/wabt/default.nix   | 20 +++++++++++-----
 pkgs/development/tools/wabt/version.patch | 28 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/tools/wabt/version.patch

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 4c7df9b12d8b..b3be6c4552dd 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, python3 }:
+{ stdenv, fetchFromGitHub, cmake, python3, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "wabt";
-  version = "1.0.12";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
-    owner  = "WebAssembly";
-    repo   = "wabt";
-    rev    = version;
-    sha256 = "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0";
+    owner = "WebAssembly";
+    repo = "wabt";
+    rev = version;
+    sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg";
+    fetchSubmodules = true;
   };
 
+  patches = [
+    (substituteAll {
+      src = ./version.patch;
+      inherit version;
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
   buildInputs = [ python3 ];
diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch
new file mode 100644
index 000000000000..a49cd0bc1552
--- /dev/null
+++ b/pkgs/development/tools/wabt/version.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 363a5660..ad3300ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,22 +68,7 @@ endif ()
+ include(CheckTypeSize)
+ check_type_size(ssize_t SSIZE_T)
+ check_type_size(size_t SIZEOF_SIZE_T)
+-
+-FIND_PACKAGE(Git QUIET REQUIRED)
+-EXECUTE_PROCESS(COMMAND
+-        "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
+-        RESULT_VARIABLE
+-            GIT_HASH_RESULT
+-        OUTPUT_VARIABLE
+-            GIT_HASH
+-        OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-IF(${GIT_HASH_RESULT} EQUAL 0)
+-    SET(WABT_VERSION_INFO "${GIT_HASH}")
+-ELSE()
+-    MESSAGE(WARNING "Error running git describe to determine version")
+-    SET(WABT_VERSION_INFO "(unable to determine version)")
+-ENDIF()
++SET(WABT_VERSION_INFO "@version@")
+ 
+ configure_file(
+   ${WABT_SOURCE_DIR}/src/config.h.in

From 5adcd5cbb72b0de20abe2c4dff0efe341e7d2cac Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sat, 18 Jan 2020 01:08:35 +0100
Subject: [PATCH 140/755] pypi2nix: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 76302824d9d2..8ecdfb6787f1 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -4,10 +4,10 @@ with python3;
 
 pkgs.buildPythonApplication rec {
   pname = "pypi2nix";
-  version = "2.0.2";
+  version = "2.0.3";
   src = pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1kynyarqx49j89nxd7rx8mjncg8hkklscfcr36smham7cvj17nsv";
+    sha256 = "0mja8q5lc0lils6s0v0l35knsj7n7779kw246jfmyvkc3l07j8df";
   };
   propagatedBuildInputs = with pkgs; [
     attrs

From 6b3c3c817a264a835f8738d46b7640b110ee5d95 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 18 Jan 2020 02:17:36 +0100
Subject: [PATCH 141/755] nixos/doc: suggest checking options for declarative
 package mgmt

Some programs might not work without systemd services registered or do not work at full capacity without NixOS module.
---
 nixos/doc/manual/configuration/declarative-packages.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index 5fb3bcb9f8f5..cd84d1951d24 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -19,6 +19,12 @@
   <command>nixos-rebuild switch</command>.
  </para>
 
+ <note>
+  <para>
+   Some packages require additional global configuration such as D-Bus or systemd service registration so adding them to <xref linkend="opt-environment.systemPackages"/> might not be sufficient. You are advised to check the <link xlink:href="#ch-options">list of options</link> whether a NixOS module for the package does not exist.
+  </para>
+ </note>
+
  <para>
   You can get a list of the available packages as follows:
 <screen>

From 87394750e4697ce4c83410dfdd48f2fa27eaf339 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 16 Jan 2020 22:47:13 -0300
Subject: [PATCH 142/755] notion: 3-2017050501 -> 3-2019050101

---
 .../window-managers/notion/default.nix        |  50 +-
 .../notion/notion-xft_nixos.diff              | 662 ------------------
 2 files changed, 22 insertions(+), 690 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/notion/notion-xft_nixos.diff

diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index 60900bd2a3c2..2b9e8237a045 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -1,45 +1,39 @@
-{
-  enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11,
-  xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which
+{ stdenv, fetchFromGitHub, pkgconfig
+, lua, gettext, which, groff, xmessage, xterm
+, readline, fontconfig, libX11, libXext, libSM
+, libXinerama, libXrandr, libXft
+, xlibsWrapper, makeWrapper
 }:
 
-assert enableXft -> libXft != null;
-
-let
+stdenv.mkDerivation rec{
   pname = "notion";
-  version = "3-2017050501";
-  inherit patches;
-in
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-  meta = with stdenv.lib; {
-    description = "Tiling tabbed window manager, follow-on to the ion window manager";
-    homepage = http://notion.sourceforge.net;
-    platforms = platforms.linux;
-    license   = licenses.notion_lgpl;
-    maintainers = with maintainers; [jfb];
-  };
+  version = "3-2019050101";
+
   src = fetchFromGitHub {
     owner = "raboof";
     repo = pname;
     rev = version;
-    sha256 = "1wq5ylpsw5lkbm3c2bzmx2ajlngwib30adxlqbvq4bgkaf9zjh65";
+    sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz";
   };
 
-  patches = patches;
-  postPatch = ''
-    substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'
-    substituteInPlace man/Makefile --replace "nroff -man -Tlatin1" "${mandoc}/bin/mandoc -T man"
-  '';
+  nativeBuildInputs = [ pkgconfig makeWrapper groff ];
+  buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
+                  libXinerama libXrandr libXft xlibsWrapper ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft;
+  buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];
 
-  buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
-  installFlags = [ "PREFIX=\${out}" ];
+  makeFlags = [ "PREFIX=\${out}" ];
 
   postInstall = ''
     wrapProgram $out/bin/notion \
       --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \
   '';
+
+  meta = with stdenv.lib; {
+    description = "Tiling tabbed window manager, follow-on to the Ion";
+    homepage = "https://notionwm.net/";
+    license   = licenses.lgpl21;
+    maintainers = with maintainers; [ jfb AndersonTorres ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
deleted file mode 100644
index 542aa446c3f2..000000000000
--- a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
+++ /dev/null
@@ -1,662 +0,0 @@
-diff -ur notion-3-2015061300/de/brush.c notion-3-2015061300-PATCHED/de/brush.c
---- notion-3-2015061300/de/brush.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/brush.c	2015-07-13 10:37:23.093298917 -0400
-@@ -48,6 +48,9 @@
-     
-     gr_stylespec_init(&brush->current_attr);
-     
-+#ifdef XFT
-+    brush->draw=NULL;
-+#endif /* XFT */
-     style->usecount++;
- 
-     if(!grbrush_init(&(brush->grbrush))){
-@@ -128,6 +131,10 @@
- {
-     destyle_unref(brush->d);
-     brush->d=NULL;
-+#ifdef XFT
-+    if(brush->draw!=NULL)
-+        XftDrawDestroy(brush->draw);
-+#endif /* XFT */
-     gr_stylespec_unalloc(&brush->current_attr);
-     grbrush_deinit(&(brush->grbrush));
- }
-@@ -139,6 +146,21 @@
- }
- 
- 
-+#ifdef XFT
-+XftDraw *debrush_get_draw(DEBrush *brush, Drawable d)
-+{
-+    if(brush->draw==NULL)
-+        brush->draw=XftDrawCreate(ioncore_g.dpy, d,
-+                                  XftDEDefaultVisual(),
-+                                  DefaultColormap(ioncore_g.dpy,
-+                                  0));
-+    else
-+        XftDrawChange(brush->draw, d);
-+
-+    return brush->draw;
-+}
-+#endif
-+
- /*}}}*/
- 
- 
-diff -ur notion-3-2015061300/de/brush.h notion-3-2015061300-PATCHED/de/brush.h
---- notion-3-2015061300/de/brush.h	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/brush.h	2015-07-13 10:37:23.096298747 -0400
-@@ -15,6 +15,10 @@
- #include <ioncore/gr.h>
- #include <ioncore/rectangle.h>
- 
-+#ifdef XFT
-+#include <X11/Xft/Xft.h>
-+#endif /* XFT */
-+
- INTRCLASS(DEBrush);
- 
- #include "style.h"
-@@ -33,6 +37,9 @@
- DECLCLASS(DEBrush){
-     GrBrush grbrush;
-     DEStyle *d;
-+#ifdef XFT
-+    XftDraw *draw;
-+#endif
-     DEBrushExtrasFn *extras_fn;
-     int indicator_w;
-     Window win;
-@@ -108,5 +115,8 @@
- extern void debrush_fill_area(DEBrush *brush, const WRectangle *geom);
- extern void debrush_clear_area(DEBrush *brush, const WRectangle *geom);
- 
-+#ifdef XFT
-+XftDraw *debrush_get_draw(DEBrush *brush, Drawable d);
-+#endif
- 
- #endif /* ION_DE_BRUSH_H */
-diff -ur notion-3-2015061300/de/colour.c notion-3-2015061300-PATCHED/de/colour.c
---- notion-3-2015061300/de/colour.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/colour.c	2015-07-13 10:37:23.098298633 -0400
-@@ -12,9 +12,21 @@
- 
- bool de_alloc_colour(WRootWin *rootwin, DEColour *ret, const char *name)
- {
-+#ifndef XFT
-     XColor c;
-     bool ok=FALSE;
-+#else /* XFT */
-+    if(name==NULL)
-+        return FALSE;
-+    return XftColorAllocName(
-+        ioncore_g.dpy,
-+        XftDEDefaultVisual(),
-+        rootwin->default_cmap,
-+        name,
-+        ret);
-+#endif /* XFT */
- 
-+#ifndef XFT
-     if(name==NULL)
-         return FALSE;
- 
-@@ -25,11 +37,13 @@
-     }
-     
-     return ok;
-+#endif /* ! XFT */
- }
- 
- 
- bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out)
- {
-+#ifndef XFT
-     XColor c;
-     c.pixel=in;
-     XQueryColor(ioncore_g.dpy, rootwin->default_cmap, &c);
-@@ -38,11 +52,20 @@
-         return TRUE;
-     }
-     return FALSE;
-+#else /* XFT */
-+    return XftColorAllocName(
-+        ioncore_g.dpy,
-+        XftDEDefaultVisual(),
-+        rootwin->default_cmap,
-+        &(in.color),
-+        out);
-+#endif /* XFT */
- }
- 
- 
- void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg)
- {
-+#ifndef XFT
-     DEColour pixels[5];
-     
-     pixels[0]=cg->bg;
-@@ -54,15 +77,26 @@
-     XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 5, 0);
-     
-     gr_stylespec_unalloc(&cg->spec);
-+#else /* XFT */
-+    de_free_colour(rootwin, cg->bg);
-+    de_free_colour(rootwin, cg->fg);
-+    de_free_colour(rootwin, cg->hl);
-+    de_free_colour(rootwin, cg->sh);
-+    de_free_colour(rootwin, cg->pad);
-+#endif /* XFT */
- }
- 
- 
- void de_free_colour(WRootWin *rootwin, DEColour col)
- {
-+#ifndef XFT
-     DEColour pixels[1];
-     
-     pixels[0]=col;
-     
-     XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 1, 0);
-+#else /* XFT */
-+    XftColorFree(ioncore_g.dpy, XftDEDefaultVisual(), rootwin->default_cmap, &col);
-+#endif /* XFT */
- }
- 
-diff -ur notion-3-2015061300/de/colour.h notion-3-2015061300-PATCHED/de/colour.h
---- notion-3-2015061300/de/colour.h	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/colour.h	2015-07-13 10:37:23.099298576 -0400
-@@ -12,12 +12,19 @@
- #include <ioncore/common.h>
- #include <ioncore/global.h>
- #include <ioncore/rootwin.h>
-+#ifdef XFT
-+#include <X11/Xft/Xft.h>
-+#endif /* XFT */
- 
- 
- INTRSTRUCT(DEColourGroup);
- 
- 
-+#ifndef XFT
- typedef unsigned long DEColour;
-+#else /* XFT */
-+typedef XftColor DEColour;
-+#endif /* XFT */
- 
- 
- DECLSTRUCT(DEColourGroup){
-@@ -34,5 +41,6 @@
- bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out);
- void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg);
- void de_free_colour(WRootWin *rootwin, DEColour col);
-+#define XftDEDefaultVisual()    DefaultVisual(ioncore_g.dpy, 0)
- 
- #endif /* ION_DE_COLOUR_H */
-diff -ur notion-3-2015061300/de/draw.c notion-3-2015061300-PATCHED/de/draw.c
---- notion-3-2015061300/de/draw.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/draw.c	2015-07-13 10:37:23.109298008 -0400
-@@ -20,6 +20,14 @@
- #include <X11/extensions/shape.h>
- 
- 
-+#ifndef XFT
-+#define PIXEL(x) x
-+#else /* XFT */
-+#define PIXEL(x) x.pixel
-+#endif /* XFT */
-+
-+
-+
- /*{{{ Colour group lookup */
- 
- 
-@@ -84,8 +92,7 @@
-     w--;
-     h--;
- 
--    XSetForeground(ioncore_g.dpy, gc, tlc);
--
-+    XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
-     
-     a=(br!=0);
-     b=0;
-@@ -104,7 +111,7 @@
-     }
- 
-     
--    XSetForeground(ioncore_g.dpy, gc, brc);
-+    XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
- 
-     a=(tl!=0);
-     b=0;
-@@ -141,23 +148,23 @@
-                             GrBorderLine line)
- {
-     if(line==GR_BORDERLINE_LEFT && geom->h>0 && tl>0){
--        XSetForeground(ioncore_g.dpy, gc, tlc);
--        XSetBackground(ioncore_g.dpy, gc, tlc);
-+        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
-+        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
-         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, tl, geom->h);
-         geom->x+=tl;
-     }else if(line==GR_BORDERLINE_TOP && geom->w>0 && tl>0){
--        XSetForeground(ioncore_g.dpy, gc, tlc);
--        XSetBackground(ioncore_g.dpy, gc, tlc);
-+        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
-+        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
-         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, geom->w, tl);
-         geom->y+=tl;
-     }else if(line==GR_BORDERLINE_RIGHT && geom->h>0 && br>0){
--        XSetForeground(ioncore_g.dpy, gc, brc);
--        XSetBackground(ioncore_g.dpy, gc, brc);
-+        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
-+        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
-         XFillRectangle(ioncore_g.dpy, win, gc, geom->x+geom->w-br, geom->y, br, geom->h);
-         geom->w-=br;
-     }else if(line==GR_BORDERLINE_BOTTOM && geom->w>0 && br>0){
--        XSetForeground(ioncore_g.dpy, gc, brc);
--        XSetBackground(ioncore_g.dpy, gc, brc);
-+        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
-+        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
-         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y+geom->h-br, geom->w, br);
-         geom->h-=br;
-     }
-@@ -388,7 +395,7 @@
-     }
-     
-     if(ISSET(a2, GR_ATTR(tagged)) || ISSET(a1, GR_ATTR(tagged))){
--        XSetForeground(ioncore_g.dpy, d->copy_gc, cg->fg);
-+        XSetForeground(ioncore_g.dpy, d->copy_gc, PIXEL(cg->fg));
-             
-         copy_masked(brush, d->tag_pixmap, brush->win, 0, 0,
-                     d->tag_pixmap_w, d->tag_pixmap_h,
-@@ -437,7 +444,7 @@
-     GC gc=brush->d->normal_gc;
-     
-     if(TRUE/*needfill*/){
--        XSetForeground(ioncore_g.dpy, gc, cg->bg);
-+        XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
-         XFillRectangle(ioncore_g.dpy, brush->win, gc, geom->x, geom->y, 
-                        geom->w, geom->h);
-     }
-@@ -605,7 +612,7 @@
-         attr.background_pixmap=ParentRelative;
-     }else{
-         attrflags=CWBackPixel;
--        attr.background_pixel=brush->d->cgrp.bg;
-+        attr.background_pixel=brush->d->PIXEL(cgrp.bg);
-     }
-     
-     XChangeWindowAttributes(ioncore_g.dpy, brush->win, attrflags, &attr);
-@@ -621,7 +628,7 @@
-     if(cg==NULL)
-         return;
-     
--    XSetForeground(ioncore_g.dpy, gc, cg->bg);
-+    XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
-     XFillRectangle(ioncore_g.dpy, brush->win, gc, 
-                    geom->x, geom->y, geom->w, geom->h);
- }
-diff -ur notion-3-2015061300/de/font.c notion-3-2015061300-PATCHED/de/font.c
---- notion-3-2015061300/de/font.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/font.c	2015-07-13 10:37:23.118297497 -0400
-@@ -13,7 +13,9 @@
- #include <ioncore/common.h>
- #include <ioncore/log.h>
- #include "font.h"
-+#ifndef XFT
- #include "fontset.h"
-+#endif /* ! XFT */
- #include "brush.h"
- #include "precompose.h"
- 
-@@ -106,6 +108,9 @@
- 
- DEFont *de_load_font(const char *fontname)
- {
-+#ifdef XFT
-+    XftFont *font;
-+#endif
-     DEFont *fnt;
-     XFontSet fontset=NULL;
-     XFontStruct *fontstruct=NULL;
-@@ -120,7 +125,8 @@
-             return fnt;
-         }
-     }
--    
-+
-+#ifndef XFT
-     if(ioncore_g.use_mb && !(ioncore_g.enc_utf8 && iso10646_font(fontname))){
-         LOG(DEBUG, FONT, "Loading fontset %s", fontname); 
-         fontset=de_create_font_set(fontname);
-@@ -149,13 +155,34 @@
-         return NULL;
-     }
-     
-+#else /* XFT */
-+    if(strncmp(fontname, "xft:", 4)==0){
-+        font=XftFontOpenName(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy),
-+                 fontname+4);
-+    }else{
-+        font=XftFontOpenXlfd(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), fontname);
-+    }
-+    
-+    if(font==NULL){
-+        if(strcmp(fontname, CF_FALLBACK_FONT_NAME)!=0){
-+            warn(TR("Could not load font \"%s\", trying \"%s\""),
-+             fontname, CF_FALLBACK_FONT_NAME);
-+            return de_load_font(CF_FALLBACK_FONT_NAME);
-+        }
-+        return NULL;
-+    }
-+#endif /* XFT */
-     fnt=ALLOC(DEFont);
-     
-     if(fnt==NULL)
-         return NULL;
-     
-+#ifndef XFT
-     fnt->fontset=fontset;
-     fnt->fontstruct=fontstruct;
-+#else
-+    fnt->font=font;
-+#endif
-     fnt->pattern=scopy(fontname);
-     fnt->next=NULL;
-     fnt->prev=NULL;
-@@ -175,11 +202,13 @@
-     style->font=font;
-     font->refcount++;
-     
-+#ifndef XFT
-     if(style->font->fontstruct!=NULL){
-         XSetFont(ioncore_g.dpy, style->normal_gc, 
-                  style->font->fontstruct->fid);
-     }
- 
-+#endif /* ! XFT */
-     return TRUE;
- }
- 
-@@ -194,11 +223,13 @@
-     if(style->font==NULL)
-         return FALSE;
-     
-+#ifndef XFT
-     if(style->font->fontstruct!=NULL){
-         XSetFont(ioncore_g.dpy, style->normal_gc, 
-                  style->font->fontstruct->fid);
-     }
-     
-+#endif /* ! XFT */
-     return TRUE;
- }
- 
-@@ -208,10 +239,15 @@
-     if(--font->refcount!=0)
-         return;
-     
-+#ifndef XFT
-     if(font->fontset!=NULL)
-         XFreeFontSet(ioncore_g.dpy, font->fontset);
-     if(font->fontstruct!=NULL)
-         XFreeFont(ioncore_g.dpy, font->fontstruct);
-+#else /* XFT */
-+    if(font->font!=NULL)
-+        XftFontClose(ioncore_g.dpy, font->font);
-+#endif /* XFT */
-     if(font->pattern!=NULL)
-         free(font->pattern);
-     
-@@ -239,6 +275,7 @@
- 
- void defont_get_font_extents(DEFont *font, GrFontExtents *fnte)
- {
-+#ifndef XFT
-     if(font->fontset!=NULL){
-         XFontSetExtents *ext=XExtentsOfFontSet(font->fontset);
-         if(ext==NULL)
-@@ -254,7 +291,14 @@
-         fnte->baseline=fnt->ascent;
-         return;
-     }
--    
-+#else /* XFT */
-+    if(font->font!=NULL){
-+        fnte->max_height=font->font->ascent+font->font->descent;
-+        fnte->max_width=font->font->max_advance_width;
-+        fnte->baseline=font->font->ascent;
-+        return;
-+    }
-+#endif /* XFT */
- fail:
-     DE_RESET_FONT_EXTENTS(fnte);
- }
-@@ -271,6 +315,7 @@
- 
- uint defont_get_text_width(DEFont *font, const char *text, uint len)
- {
-+#ifndef XFT
-     if(font->fontset!=NULL){
-         XRectangle lext;
- #ifdef CF_DE_USE_XUTF8
-@@ -298,6 +343,18 @@
-     }else{
-         return 0;
-     }
-+#else /* XFT */
-+    if(font->font!=NULL){
-+        XGlyphInfo extents;
-+        if(ioncore_g.enc_utf8)
-+            XftTextExtentsUtf8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents);
-+        else
-+            XftTextExtents8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents);
-+        return extents.xOff;
-+    }else{
-+        return 0;
-+    }
-+#endif /* XFT */
- }
- 
- 
-@@ -307,6 +364,7 @@
- /*{{{ String drawing */
- 
- 
-+#ifndef XFT
- void debrush_do_draw_string_default(DEBrush *brush, int x, int y,
-                                     const char *str, int len, bool needfill, 
-                                     DEColourGroup *colours)
-@@ -366,6 +424,43 @@
-     }
- }
- 
-+#else /* XFT */
-+void debrush_do_draw_string_default(DEBrush *brush, 
-+                                    int x, int y, const char *str,
-+                                    int len, bool needfill, 
-+                                    DEColourGroup *colours)
-+{
-+    Window win = brush->win;
-+    GC gc=brush->d->normal_gc;
-+    XftDraw *draw;
-+    XftFont *font;
-+    
-+    if(brush->d->font==NULL)
-+        return;
-+
-+    font=brush->d->font->font;
-+    draw=debrush_get_draw(brush, win);
-+
-+    if(needfill){
-+        XGlyphInfo extents;
-+        if(ioncore_g.enc_utf8){
-+            XftTextExtentsUtf8(ioncore_g.dpy, font, (XftChar8 *)str, len,
-+                               &extents);
-+        }else{
-+            XftTextExtents8(ioncore_g.dpy, font, (XftChar8 *)str, len, &extents);
-+            XftDrawRect(draw, &(colours->bg), x-extents.x, y-extents.y,
-+                        extents.width+10, extents.height);
-+        }
-+    }
-+
-+    if(ioncore_g.enc_utf8){
-+        XftDrawStringUtf8(draw, &(colours->fg), font, x, y, (XftChar8 *)str,
-+                          len);
-+    }else{
-+        XftDrawString8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, len);
-+    }
-+}
-+#endif /* XFT */
- 
- void debrush_do_draw_string(DEBrush *brush, int x, int y,
-                             const char *str, int len, bool needfill, 
-diff -ur notion-3-2015061300/de/font.h notion-3-2015061300-PATCHED/de/font.h
---- notion-3-2015061300/de/font.h	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/font.h	2015-07-13 10:37:23.119297440 -0400
-@@ -12,6 +12,9 @@
- 
- #include <ioncore/common.h>
- #include <ioncore/gr.h>
-+#ifdef XFT
-+#include <X11/Xft/Xft.h>
-+#endif /* XFT */
- 
- INTRSTRUCT(DEFont);
- 
-@@ -27,6 +30,9 @@
-     int refcount;
-     XFontSet fontset;
-     XFontStruct *fontstruct;
-+#ifdef XFT /* XFT */
-+    XftFont *font;
-+#endif /* XFT */
-     DEFont *next, *prev;
- };
- 
-diff -ur notion-3-2015061300/de/init.c notion-3-2015061300-PATCHED/de/init.c
---- notion-3-2015061300/de/init.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/init.c	2015-07-13 10:37:23.122297270 -0400
-@@ -165,17 +165,26 @@
- {
-     bool bgset;
-     DEColour padinh;
--    
-+    DEColour black, white;
-+
-+#ifdef XFT
-+    de_alloc_colour(rootwin, &black, "black");
-+    de_alloc_colour(rootwin, &white, "white");
-+#else
-+    black=DE_BLACK(rootwin);
-+    white=DE_WHITE(rootwin);
-+#endif
-+
-     de_get_colour(rootwin, &(cg->hl), tab, "highlight_colour",
--                  (based_on ? based_on->cgrp.hl : DE_WHITE(rootwin)));
-+                  (based_on ? based_on->cgrp.hl : white));
-     de_get_colour(rootwin, &(cg->sh), tab, "shadow_colour",
--                  (based_on ? based_on->cgrp.sh : DE_WHITE(rootwin)));
-+                  (based_on ? based_on->cgrp.sh : white));
-     de_get_colour(rootwin, &(cg->fg), tab, "foreground_colour",
--                  (based_on ? based_on->cgrp.fg : DE_WHITE(rootwin)));
-+                  (based_on ? based_on->cgrp.fg : white));
-     bgset=de_get_colour(rootwin, &(cg->bg), tab, "background_colour",
--                        (based_on ? based_on->cgrp.bg : DE_BLACK(rootwin)));
-+                        (based_on ? based_on->cgrp.bg : black));
-                         
--    padinh=(based_on ? based_on->cgrp.pad : DE_WHITE(rootwin));
-+    padinh=(based_on ? based_on->cgrp.pad : white);
-     
-     de_get_colour_(rootwin, &(cg->pad), tab, "padding_colour", 
-                    (bgset ? cg->bg : padinh), padinh);
-diff -ur notion-3-2015061300/de/style.c notion-3-2015061300-PATCHED/de/style.c
---- notion-3-2015061300/de/style.c	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/style.c	2015-07-13 10:37:23.128296929 -0400
-@@ -70,10 +70,17 @@
-     /*gcv.function=GXclear;*/
-     gcv.stipple=stipple_pixmap;
-     gcvmask=GCFillStyle|GCStipple/*|GCFunction*/;
-+#ifndef XFT
-     if(style->font!=NULL && style->font->fontstruct!=NULL){
-         gcv.font=style->font->fontstruct->fid;
-         gcvmask|=GCFont;
-     }
-+#else /* XFT */
-+//    if(style->font!=NULL){
-+//        gcv.font=style->font;
-+//        gcvmask|=GCFont;
-+//    }
-+#endif /* XFT */
- 
-     style->stipple_gc=XCreateGC(dpy, root, gcvmask, &gcv);
-     XCopyGC(dpy, style->normal_gc, 
-@@ -201,6 +208,14 @@
- 
- bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name)
- {
-+    DEColour black, white;
-+#ifdef XFT
-+    de_alloc_colour(rootwin, &black, "black");
-+    de_alloc_colour(rootwin, &white, "white");
-+#else
-+    black=DE_BLACK(rootwin);
-+    white=DE_WHITE(rootwin);
-+#endif /* XFT */
-     if(!gr_stylespec_load(&style->spec, name))
-         return FALSE;
-     
-@@ -223,11 +238,11 @@
-     style->textalign=DEALIGN_CENTER;
- 
-     style->cgrp_alloced=FALSE;
--    style->cgrp.bg=DE_BLACK(rootwin);
--    style->cgrp.pad=DE_BLACK(rootwin);
--    style->cgrp.fg=DE_WHITE(rootwin);
--    style->cgrp.hl=DE_WHITE(rootwin);
--    style->cgrp.sh=DE_WHITE(rootwin);
-+    style->cgrp.bg=black;
-+    style->cgrp.pad=black;
-+    style->cgrp.fg=white;
-+    style->cgrp.hl=white;
-+    style->cgrp.sh=white;
-     gr_stylespec_init(&style->cgrp.spec);
-     
-     style->font=NULL;
-diff -ur notion-3-2015061300/de/style.h notion-3-2015061300-PATCHED/de/style.h
---- notion-3-2015061300/de/style.h	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/de/style.h	2015-07-13 10:37:23.130296815 -0400
-@@ -80,6 +80,7 @@
-     Pixmap tag_pixmap;
-     int tag_pixmap_w;
-     int tag_pixmap_h;
-+    int xft_style;
-     
-     DEStyle *next, *prev;
- };
-diff -ur notion-3-2015061300/system-autodetect.mk notion-3-2015061300-PATCHED/system-autodetect.mk
---- notion-3-2015061300/system-autodetect.mk	2015-06-13 10:37:26.000000000 -0400
-+++ notion-3-2015061300-PATCHED/system-autodetect.mk	2015-07-13 10:38:14.921332013 -0400
-@@ -103,6 +103,19 @@
- 
- 
- ##
-+## Xft support
-+##
-+
-+USE_XFT=1
-+
-+ifeq ($(USE_XFT),1)
-+EXTRA_INCLUDES += `pkg-config xft --cflags`
-+EXTRA_LIBS += `pkg-config xft --libs`
-+DEFINES += -DXFT -DCF_FALLBACK_FONT_NAME=\"Sans\"
-+endif
-+
-+
-+##
- ## Localisation
- ##
- 

From 8314e759a8ec17d91434332becdfd17704d6119f Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 18 Jan 2020 09:56:41 +0100
Subject: [PATCH 143/755] gitea: 1.10.2 -> 1.10.3

---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 4d5814548ff1..2bd1f6434b7b 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "04ksalhpf47wzjfhx295kf4rbamxbb3s9946vfda358lm360adic";
+    sha256 = "04jg1b0d1fbhnk434dnffc2c118gs084za3m33lxwf5lxzlbbimc";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''

From 2d0a6808d7fc46a5ed4bdb1e4417247ad74a5d76 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jan 2020 04:20:00 -0500
Subject: [PATCH 144/755] rage: init at 0.2.0

---
 pkgs/tools/security/rage/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/security/rage/default.nix

diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
new file mode 100644
index 000000000000..63cc2972a58d
--- /dev/null
+++ b/pkgs/tools/security/rage/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rage";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "str4d";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ri4rfhy1wl0cppi2cp97kkiz08x2f072yfahn2kv9r4v1i9f4a7";
+  };
+
+  cargoSha256 = "02adwvcvha83zcvc5n7p88l7wmkg52j2xhznmhabc0zn328as2yd";
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
+    description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
+    homepage = "https://github.com/str4d/rage";
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891e984a2482..301fa9f746ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2944,6 +2944,10 @@ in
 
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
+  rage = callPackage ../tools/security/rage {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   s-tar = callPackage ../tools/archivers/s-tar {};
 
   sonota = callPackage ../tools/misc/sonota { };

From fb055f51aa5a5b5c769c304c2cde07a006b14b02 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jan 2020 04:20:00 -0500
Subject: [PATCH 145/755] mrsh: enable on darwin

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

diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix
index 9036e0854295..bbd56e510b7d 100644
--- a/pkgs/shells/mrsh/default.nix
+++ b/pkgs/shells/mrsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, readline }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }:
 
 stdenv.mkDerivation rec {
   pname   = "mrsh";
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = "https://mrsh.sh";
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From d18ac2bca18eb0b3f77511f74f192453c7184b67 Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Sun, 5 Jan 2020 14:43:39 +0100
Subject: [PATCH 146/755] gdm: refactor to properly handle wayland sessions

---
 .../modules/services/x11/desktop-managers/gnome3.nix  |  2 +-
 nixos/modules/services/x11/display-managers/gdm.nix   |  4 ++++
 pkgs/desktops/gnome-3/core/gnome-session/default.nix  | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 6d9bd284bc72..60b9a7eed869 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -144,7 +144,7 @@ in
       services.gnome3.core-shell.enable = true;
       services.gnome3.core-utilities.enable = mkDefault true;
 
-      services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session ];
+      services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session.sessions ];
 
       environment.extraInit = ''
         ${concatMapStrings (p: ''
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 2f8c8cc90137..325023f4121a 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -174,6 +174,10 @@ in
       "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
     ];
 
+    # Otherwise GDM will not be able to start correctly and display Wayland sessions
+    systemd.packages = with pkgs.gnome3; [ gnome-session gnome-shell ];
+    environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ];
+
     systemd.services.display-manager.wants = [
       # Because sd_login_monitor_new requires /run/systemd/machines
       "systemd-machined.service"
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 459512017c5d..3df78b88090f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
   pname = "gnome-session";
   version = "3.34.2";
 
+  outputs = ["out" "sessions"];
+
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb";
@@ -50,6 +52,15 @@ stdenv.mkDerivation rec {
       --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
   '';
 
+  # We move the GNOME sessions to another output since gnome-session is a dependency of
+  # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is
+  # enabled without proper GNOME installation.
+  postInstall = ''
+    mkdir $sessions
+    moveToOutput share/wayland-sessions "$sessions"
+    moveToOutput share/xsessions "$sessions"
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-session";

From 07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 18 Jan 2020 11:16:59 +0100
Subject: [PATCH 147/755] python2.pkgs.nixpart0: use correct libselinux
 bindings

Sine 56e557257df675bc6b2cbebf3ba5bc6d51b2321c libselinux in pkgs defaults to Python 3 so let's use the one from python.pkgs to make sure it matches.
---
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix  | 2 +-
 pkgs/tools/filesystems/nixpart/0.4/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index da2dff6b77a9..003a0e24fb52 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -35,7 +35,7 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    pykickstart pyparted pyblock libselinux.py cryptsetup
+    pykickstart pyparted pyblock libselinux cryptsetup
   ] ++ stdenv.lib.optional useNixUdev systemd;
 
   # tests are currently _heavily_ broken upstream
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 129283e83ebe..5d7a9dd14ec0 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, python, buildPythonApplication
+, libselinux
 # Propagated to blivet
 , useNixUdev ? true
 # Needed by NixOps
@@ -10,10 +11,9 @@
 let
   blivet = import ./blivet.nix {
     inherit stdenv fetchurl buildPythonApplication;
-    inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
+    inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
     inherit useNixUdev;
     inherit (pkgs) lsof utillinux systemd;
-    libselinux = pkgs.libselinux.override { enablePython = true; };
   };
 
   cryptsetup = import ./cryptsetup.nix {

From d914e9d1dbab827a49c9ad2e4b2def9acc8a836d Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Sat, 18 Jan 2020 11:56:07 +0100
Subject: [PATCH 148/755] firejail: 0.9.60 -> 0.9.62

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 8200acf62b7d..5a1337b0998d 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.60";
+    version="0.9.62";
     name="${baseName}-${version}";
     url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz";
-    sha256="1mw2s040wbxaj4lqfm6033wxrxlnix40mqc2bsfran5sj2gxd3sh";
+    sha256="1q2silgy882fl61p5qa9f9jqkxcqnwa71jig3c729iahx4f0hs05";
   };
   buildInputs = [
     which

From ae3ba80c6d16ab60d11f447816e4449674430c1d Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Sat, 18 Jan 2020 13:50:53 +0200
Subject: [PATCH 149/755] nebula: 1.0.0 -> 1.1.0

---
 pkgs/tools/networking/nebula/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index 7f9d194e44a2..3411aca55519 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nebula";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j7fna352z8kzx6n0hck7rp122c0v44j9syz0v30vq47xq2pwj5c";
+    sha256 = "0nwagk3q2gkirqrk27fisad2c2p2y1lsvz5phax9v5h51p1y79ia";
   };
 
-  modSha256 = "130h0gc5z0w5inpc99y6mismwg3nyzk3bqdq5v9yclkxlhkbcp6d";
+  modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij";
 
   subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
 

From 1470109737f6c00473e871ba235ea3035df45161 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 18 Jan 2020 13:51:10 +0100
Subject: [PATCH 150/755] bandwhich: 0.9.0 -> 0.10.0

https://github.com/imsnif/bandwhich/releases/tag/0.10.0
---
 pkgs/tools/networking/bandwhich/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index ae45e0c1fc12..a399e7209af3 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bandwhich";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = pname;
     rev = version;
-    sha256 = "0gjk84a4ks5107vrchwwnslpbcrprmznjy3sqn2mrwfvw5biycb3";
+    sha256 = "0xq2lv06dx7g00b4amk131krlsb6acsz7b228pn3iz6gy31fhz3y";
   };
 
   cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";

From 2e2cb2890c6a42748f710c028bd963be64da4cc2 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Sat, 18 Jan 2020 13:54:43 +0100
Subject: [PATCH 151/755] svxlink: init at 19.09.1 (#76990)

---
 pkgs/applications/radio/svxlink/default.nix | 71 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/radio/svxlink/default.nix

diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix
new file mode 100644
index 000000000000..e06fcb5d3e67
--- /dev/null
+++ b/pkgs/applications/radio/svxlink/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex
+, libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools
+, wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }:
+
+let
+  desktopItem = makeDesktopItem rec {
+    name = "Qtel";
+    exec = "qtel";
+    icon = "qtel";
+    desktopName = name;
+    genericName = "EchoLink Client";
+    categories = "HamRadio;Qt;Network;";
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "svxlink";
+  version = "19.09.1";
+
+  src = fetchFromGitHub {
+    owner = "sm0svx";
+    repo = pname;
+    rev = version;
+    sha256 = "0xmbac821w9kl7imlz0mra19mlhi0rlpbyyay26w1y7h98j4g4yp";
+  };
+
+  cmakeFlags = [
+    "-DDO_INSTALL_CHOWN=NO"
+    "-DRTLSDR_LIBRARIES=${rtl-sdr}/lib/librtlsdr.so"
+    "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include"
+    "../src"
+  ];
+  enableParallelBuilding = true;
+  dontWrapQtApps = true;
+
+  nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ];
+
+  buildInputs = [
+    alsaLib
+    curl
+    gsm
+    libgcrypt
+    libsigcxx
+    libopus
+    popt
+    qtbase
+    qttools
+    rtl-sdr
+    speex
+    tcl
+  ];
+
+  postInstall = ''
+    rm -f $out/share/applications/*
+    cp -v ${desktopItem}/share/applications/* $out/share/applications
+    mv $out/share/icons/link.xpm $out/share/icons/qtel.xpm
+
+    wrapQtApp $out/bin/qtel
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Advanced repeater controller and EchoLink software";
+    longDescription = ''
+      Advanced repeater controller and EchoLink software for Linux including a
+      GUI, Qtel - The Qt EchoLink client
+    '';
+    homepage = "http://www.svxlink.org/";
+    license = with licenses; [ gpl2 ];
+    maintainers = with maintainers; [ zaninime ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 580702467db6..45007c4431a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14340,6 +14340,8 @@ in
 
   svrcore = callPackage ../development/libraries/svrcore { };
 
+  svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
+
   swiftclient = python3.pkgs.callPackage ../tools/admin/swiftclient { };
 
   sword = callPackage ../development/libraries/sword { };

From c71aa5ff5ea37b77bf016590160a9456441c9a61 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Sat, 18 Jan 2020 07:15:59 -0600
Subject: [PATCH 152/755] purescript: 0.13.5 -> 0.13.6

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

diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index f1126fdeddfd..65e4bb529ee1 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "purescript";
-  version = "0.13.5";
+  version = "0.13.6";
 
   src =
     if stdenv.isDarwin
     then
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
-      sha256 = "19bb50m0cd738r353blgy21d842b3yj58xfbplk7bz59jawj9lym";
+      sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25";
     }
     else
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
-      sha256 = "016wvwypgb4859f0n1lqsqv9a8cca2y8g7d6ffvzx6rncd115gxi";
+      sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns";
     };
 
 

From 37771e47ebac2329d269d412b3463210904ed65e Mon Sep 17 00:00:00 2001
From: Thomas Marchand <thomas.marchand@tuta.io>
Date: Sat, 18 Jan 2020 09:59:06 +0100
Subject: [PATCH 153/755] wpsoffice: 11.1.0.8865 -> 11.1.0.9080

---
 pkgs/applications/office/wpsoffice/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index abc2d1862cbf..7032632da884 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec{
   pname = "wpsoffice";
-  version = "11.1.0.8865";
+  version = "11.1.0.9080";
 
   src = fetchurl {
-    url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/8865/wps-office_11.1.0.8865_amd64.deb";
-    sha256 = "1hfpj1ayhzlrnnp72yjzrpd60xsbj9y46m345lqysiaj1hnwdbd8";
+    url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/wps-office_11.1.0.9080.XA_amd64.deb";
+    sha256 = "1731e9aea22ef4e558ad66b1373d863452b4f570aecf09d448ae28a821333454";
   };
   unpackCmd = "dpkg -x $src .";
   sourceRoot = ".";
@@ -75,24 +75,20 @@ stdenv.mkDerivation rec{
     mkdir -p $out
     cp -r opt $out
     cp -r usr/* $out
-
     # Avoid forbidden reference error due use of patchelf
     rm -r *
-
     for i in wps wpp et wpspdf; do
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --force-rpath --set-rpath "$(patchelf --print-rpath $prefix/office6/$i):${stdenv.cc.cc.lib}/lib64:${libPath}" \
         $prefix/office6/$i
-
       substituteInPlace $out/bin/$i \
         --replace /opt/kingsoft/wps-office $prefix
     done
-
     for i in $out/share/applications/*;do
       substituteInPlace $i \
         --replace /usr/bin $out/bin \
         --replace /opt/kingsoft/wps-office $prefix
     done
   '';
-}
+}
\ No newline at end of file

From 78941c037f7adffbf1ebca4181976266586c93bd Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Sat, 18 Jan 2020 07:20:52 -0600
Subject: [PATCH 154/755] purescript: add maintainer mbbx6spp

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

diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 65e4bb529ee1..d1797a448ad1 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
     description = "A strongly-typed functional programming language that compiles to JavaScript";
     homepage = http://www.purescript.org/;
     license = licenses.bsd3;
-    maintainers = [ maintainers.justinwoo ];
+    maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From b873eb73171281c146166093a79fda61b736eb81 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 18 Jan 2020 07:34:18 -0600
Subject: [PATCH 155/755] packagekit: 1.1.12 -> 1.1.13 (#77498)

* packagekit: 1.1.12 -> 1.1.13

https://github.com/hughsie/PackageKit/blob/PACKAGEKIT_1_1_13/NEWS

* packagekit: set systemd user unit dir, minor touchups

While visiting:
* drop trailing slash in system unit dir
* prefer placeholder over escaping

* packagekit: dbus dir fixup (thanks @worldofpeace!)

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/tools/package-management/packagekit/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 81cfcb662c49..dc69ae457dcd 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit";
-  version = "1.1.12";
+  version = "1.1.13";
 
   outputs = [ "out" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
+    sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam";
   };
 
   buildInputs = [ glib polkit python3 gobject-introspection ]
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
-    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system/"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
   ]
   ++ lib.optional enableNixBackend "--enable-nix"
   ++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   installFlags = [
-    "sysconfdir=\${out}/etc"
+    "sysconfdir=${placeholder "out"}/etc"
     "localstatedir=\${TMPDIR}"
   ];
 

From acd9e87ebead3958782cc15fcdfb115a75af7265 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 08:31:43 -0500
Subject: [PATCH 156/755] solr: drop 7.x series

---
 nixos/modules/services/search/solr.nix |  12 +--
 nixos/tests/solr.nix                   | 107 +++++++++++--------------
 pkgs/servers/search/solr/8.x.nix       |  35 --------
 pkgs/servers/search/solr/default.nix   |   8 +-
 pkgs/top-level/all-packages.nix        |   6 +-
 5 files changed, 54 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/servers/search/solr/8.x.nix

diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index b2176225493e..a8615a20a1cf 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -13,19 +13,11 @@ in
     services.solr = {
       enable = mkEnableOption "Solr";
 
-      # default to the 8.x series not forcing major version upgrade of those on the 7.x series
       package = mkOption {
         type = types.package;
-        default = if versionAtLeast config.system.stateVersion "19.09"
-          then pkgs.solr_8
-          else pkgs.solr_7
-        ;
+        default = pkgs.solr;
         defaultText = "pkgs.solr";
-        description = ''
-          Which Solr package to use. This defaults to version 7.x if
-          <literal>system.stateVersion &lt; 19.09</literal> and version 8.x
-          otherwise.
-        '';
+        description = "Which Solr package to use.";
       };
 
       port = mkOption {
diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix
index 2108e851bc59..23e1a960fb37 100644
--- a/nixos/tests/solr.nix
+++ b/nixos/tests/solr.nix
@@ -1,65 +1,48 @@
-{ system ? builtins.currentSystem,
-  config ? {},
-  pkgs ? import ../.. { inherit system config; }
-}:
+import ./make-test.nix ({ pkgs, ... }:
 
-with import ../lib/testing.nix { inherit system pkgs; };
-with pkgs.lib;
-
-let
-  solrTest = package: makeTest {
-    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;
-        services.solr.package = package;
-      };
-
-    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;
-    '';
-  };
-in
 {
-  solr_7 = solrTest pkgs.solr_7 // {
-    name = "solr_7";
-    meta.maintainers = [ lib.maintainers.aanderse ];
-  };
+  name = "solr";
+  meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
 
-  solr_8 = solrTest pkgs.solr_8 // {
-    name = "solr_8";
-    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/8.x.nix b/pkgs/servers/search/solr/8.x.nix
deleted file mode 100644
index db70aadf8d53..000000000000
--- a/pkgs/servers/search/solr/8.x.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "solr";
-  version = "8.4.0";
-
-  src = fetchurl {
-    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    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; {
-    homepage = "https://lucene.apache.org/solr/";
-    description = "Open source enterprise search platform from the Apache Lucene project";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ domenkozar aanderse ];
-  };
-
-}
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index c94b11c91dde..db70aadf8d53 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "7.7.2";
+  version = "8.4.0";
 
   src = fetchurl {
-    url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";
+    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
+    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -29,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.domenkozar maintainers.aanderse ];
+    maintainers = with maintainers; [ domenkozar aanderse ];
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d9437ef7a15..b7592c4f1dd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6453,9 +6453,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  solr = solr_8;
-  solr_7 = callPackage ../servers/search/solr { };
-  solr_8 = callPackage ../servers/search/solr/8.x.nix { };
+  solr = callPackage ../servers/search/solr { };
+  solr_7 = solr;
+  solr_8 = solr;
 
   solvespace = callPackage ../applications/graphics/solvespace { };
 

From 19185c54ad5f8dcaf2a22e6f3f831b254f2f1a30 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 08:55:40 -0500
Subject: [PATCH 157/755] solr: specify NixOS test

---
 pkgs/servers/search/solr/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index db70aadf8d53..a3e2e177cc4b 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "solr";
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) solr;
+  };
+
   meta = with stdenv.lib; {
     homepage = "https://lucene.apache.org/solr/";
     description = "Open source enterprise search platform from the Apache Lucene project";

From 1093736abb435796d5ce0d804f6ec49ba8dff7b1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 09:00:04 -0500
Subject: [PATCH 158/755] solr: 8.4.0 -> 8.4.1

---
 pkgs/servers/search/solr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index a3e2e177cc4b..701d3880cbd0 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.4.0";
+  version = "8.4.1";
 
   src = fetchurl {
     url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
+    sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 52cf727a53ff1805da0da9ef86ecc27e20c3d335 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 5 Jan 2020 12:00:00 +0000
Subject: [PATCH 159/755] nixos/roundcube: do not write passwords to the store
 nor run php as root

If the database is local, use postgres peer authentication.
Otherwise, use a password file.

Leave database initialisation to postgresql.ensure*.
Leave /var/lib/roundcube creation to systemd.
Run php upgrade script as unpriviledged user.
---
 nixos/modules/services/mail/roundcube.nix | 68 ++++++++++++++++-------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 36dda619ad06..b064c717958d 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -5,6 +5,8 @@ with lib;
 let
   cfg = config.services.roundcube;
   fpm = config.services.phpfpm.pools.roundcube;
+  localDB = cfg.database.host == "localhost";
+  user = cfg.database.username;
 in
 {
   options.services.roundcube = {
@@ -44,7 +46,10 @@ in
       username = mkOption {
         type = types.str;
         default = "roundcube";
-        description = "Username for the postgresql connection";
+        description = ''
+          Username for the postgresql connection.
+          If <literal>database.host</literal> is set to <literal>localhost</literal>, a unix user and group of the same name will be created as well.
+        '';
       };
       host = mkOption {
         type = types.str;
@@ -58,7 +63,12 @@ in
       };
       password = mkOption {
         type = types.str;
-        description = "Password for the postgresql connection";
+        description = "Password for the postgresql connection. Do not use: the password will be stored world readable in the store; use <literal>passwordFile</literal> instead.";
+        default = "";
+      };
+      passwordFile = mkOption {
+        type = types.str;
+        description = "Password file for the postgresql connection. Must be readable by user <literal>nginx</literal>. Ignored if <literal>database.host</literal> is set to <literal>localhost</literal>, as peer authentication will be used.";
       };
       dbname = mkOption {
         type = types.str;
@@ -83,11 +93,17 @@ in
   };
 
   config = mkIf cfg.enable {
+    # backward compatibility: if password is set but not passwordFile, make one.
+    services.roundcube.database.passwordFile = mkIf (!localDB && cfg.database.password != "") (mkDefault ("${pkgs.writeText "roundcube-password" cfg.database.password}"));
+    warnings = lib.optional (!localDB && cfg.database.password != "") "services.roundcube.database.password is deprecated and insecure; use services.roundcube.database.passwordFile instead";
+
     environment.etc."roundcube/config.inc.php".text = ''
       <?php
 
+      ${lib.optionalString (!localDB) "$password = file_get_contents('${cfg.database.passwordFile}');"}
+
       $config = array();
-      $config['db_dsnw'] = 'pgsql://${cfg.database.username}:${cfg.database.password}@${cfg.database.host}/${cfg.database.dbname}';
+      $config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}';
       $config['log_driver'] = 'syslog';
       $config['max_message_size'] = '25M';
       $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}];
@@ -116,12 +132,26 @@ in
       };
     };
 
-    services.postgresql = mkIf (cfg.database.host == "localhost") {
+    services.postgresql = mkIf localDB {
       enable = true;
+      ensureDatabases = [ cfg.database.dbname ];
+      ensureUsers = [ {
+        name = cfg.database.username;
+        ensurePermissions = {
+          "DATABASE ${cfg.database.username}" = "ALL PRIVILEGES";
+        };
+      } ];
     };
 
+    users.users.${user} = mkIf localDB {
+      group = user;
+      isSystemUser = true;
+      createHome = false;
+    };
+    users.groups.${user} = mkIf localDB {};
+
     services.phpfpm.pools.roundcube = {
-      user = "nginx";
+      user = if localDB then user else "nginx";
       phpOptions = ''
         error_log = 'stderr'
         log_errors = on
@@ -143,9 +173,7 @@ in
     };
     systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
 
-    systemd.services.roundcube-setup = let
-      pgSuperUser = config.services.postgresql.superUser;
-    in mkMerge [
+    systemd.services.roundcube-setup = mkMerge [
       (mkIf (cfg.database.host == "localhost") {
         requires = [ "postgresql.service" ];
         after = [ "postgresql.service" ];
@@ -153,22 +181,22 @@ in
       })
       {
         wantedBy = [ "multi-user.target" ];
-        script = ''
-          mkdir -p /var/lib/roundcube
-          if [ ! -f /var/lib/roundcube/db-created ]; then
-            if [ "${cfg.database.host}" = "localhost" ]; then
-              ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
-              ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
-            fi
-            PGPASSWORD="${cfg.database.password}" ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-              -f ${cfg.package}/SQL/postgres.initial.sql \
-              -h ${cfg.database.host} ${cfg.database.dbname}
-            touch /var/lib/roundcube/db-created
+        script = let
+          psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}";
+        in
+        ''
+          version="$(${psql} -t <<< "select value from system where name = 'roundcube-version';" || true)"
+          if ! (grep -E '[a-zA-Z0-9]' <<< "$version"); then
+            ${psql} -f ${cfg.package}/SQL/postgres.initial.sql
           fi
 
           ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
         '';
-        serviceConfig.Type = "oneshot";
+        serviceConfig = {
+          Type = "oneshot";
+          StateDirectory = "roundcube";
+          User = if localDB then user else "nginx";
+        };
       }
     ];
   };

From b6e6bec57c7ad457ae90a809a9a064b879c7e5f2 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 5 Jan 2020 12:00:00 +0000
Subject: [PATCH 160/755] nixos/roundcube: don't use the default and insecure
 des_key

The php installer creates a random one, but we bypass it, so we have
to create one ourselves.

This should be backward compatible as encryption is used for session
cookies only: users at the time of the upgrade will be logged out but
nothing more.

https://github.com/roundcube/roundcubemail/blob/259b7fa0650fea9320b38cb17c4e80497acae7a3/config/config.inc.php.sample#L73
---
 nixos/modules/services/mail/roundcube.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index b064c717958d..22c14666a3a7 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -107,6 +107,7 @@ in
       $config['log_driver'] = 'syslog';
       $config['max_message_size'] = '25M';
       $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}];
+      $config['des_key'] = file_get_contents('/var/lib/roundcube/des_key');
       ${cfg.extraConfig}
     '';
 
@@ -190,12 +191,21 @@ in
             ${psql} -f ${cfg.package}/SQL/postgres.initial.sql
           fi
 
+          if [ ! -f /var/lib/roundcube/des_key ]; then
+            base64 /dev/urandom | head -c 24 > /var/lib/roundcube/des_key;
+            # we need to log out everyone in case change the des_key
+            # from the default when upgrading from nixos 19.09
+            ${psql} <<< 'TRUNCATE TABLE session;'
+          fi
+
           ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
         '';
         serviceConfig = {
           Type = "oneshot";
           StateDirectory = "roundcube";
           User = if localDB then user else "nginx";
+          # so that the des_key is not world readable
+          StateDirectoryMode = "0700";
         };
       }
     ];

From b5d692e12336b594c12c6ee1a21e7c3181c6ed98 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 5 Jan 2020 12:00:00 +0000
Subject: [PATCH 161/755] nixos/roundcube: provide path to mime.types file

fixes this warning:
WARNING: Mimetype to file extension mapping doesn't work properly!
---
 nixos/modules/services/mail/roundcube.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index 22c14666a3a7..0bb0eaedad50 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -108,6 +108,7 @@ in
       $config['max_message_size'] = '25M';
       $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}];
       $config['des_key'] = file_get_contents('/var/lib/roundcube/des_key');
+      $config['mime_types'] = '${pkgs.nginx}/conf/mime.types';
       ${cfg.extraConfig}
     '';
 

From 6b6e54eebd2ff71a4f1a5d52f6876eccded85392 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 12 Dec 2019 17:44:53 +0100
Subject: [PATCH 162/755] pythonPackages.pypandoc: 1.4 -> 2018-06-18

Switch to an unstable version to make it work with pandoc v2.

Based on #56592 by @Twey. Reworked dependency handling.
---
 .../python-modules/pypandoc/default.nix       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index 3af86dabe215..fc5263d81096 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pip, pandoc, glibcLocales, haskellPackages, texlive }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, pandoc, haskellPackages, texlive }:
 
 buildPythonPackage rec {
   pname = "pypandoc";
-  version = "1.4";
+  version = "unstable-2018-06-18";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b";
+  src = fetchFromGitHub {
+    owner = "bebraw";
+    repo = pname;
+    rev = "87912f0f17e0a71c1160008df708c876d32e5819";
+    sha256 = "0l6knkxxhmni4lx8hyvbb71svnhza08ivyklqlk5fw637gznc0hx";
   };
 
-  # Fix tests: first requires network access, second is a bug (reported upstream)
-  preConfigure = ''
+  postPatch = ''
+    # set pandoc path statically
+    sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py
+
+    # Fix tests: requires network access
     substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
-    substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
   '';
 
-  LC_ALL="en_US.UTF-8";
-
-  propagatedBuildInputs = [ pip ];
-
-  buildInputs = [ pandoc texlive.combined.scheme-small haskellPackages.pandoc-citeproc glibcLocales ];
+  preCheck = ''
+    export PATH="${haskellPackages.pandoc-citeproc}/bin:${texlive.combined.scheme-small}/bin:$PATH"
+  '';
 
   meta = with stdenv.lib; {
     description = "Thin wrapper for pandoc";
     homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
     maintainers = with maintainers; [ bennofs ];
-
-    broken = true; # incompatible with pandoc v2
   };
 }

From 5088ef5a19c4eee03bbacce62e66ec7cca169d70 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 12 Dec 2019 23:11:25 +0100
Subject: [PATCH 163/755] uberwriter: init at 2019-11-29

---
 .../editors/uberwriter/default.nix            | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/editors/uberwriter/default.nix

diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/uberwriter/default.nix
new file mode 100644
index 000000000000..ac3fb920da05
--- /dev/null
+++ b/pkgs/applications/editors/uberwriter/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, meson, ninja, cmake
+, wrapGAppsHook, pkgconfig, desktop-file-utils
+, appstream-glib, pythonPackages, glib, gobject-introspection
+, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
+, haskellPackages}:
+
+let
+  pythonEnv = pythonPackages.python.withPackages(p: with p;
+    [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]);
+  texliveDist = texlive.combined.scheme-medium;
+
+in stdenv.mkDerivation rec {
+  pname = "uberwriter";
+  version = "unstable-2019-11-29";
+
+  src = fetchFromGitHub {
+    owner  = pname;
+    repo   = pname;
+    rev    = "7606a55389f8516d9fed7927fa50ff8822ee9e38";
+    sha256 = "0ky001vs9nfvqf05h4q7fl0n8vsgim59z22i66a8sw6bqipv62sg";
+  };
+
+  nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils
+    appstream-glib wrapGAppsHook ];
+
+  buildInputs = [ glib pythonEnv gobject-introspection gtk3
+    gnome3.adwaita-icon-theme webkitgtk gspell texliveDist
+    glib-networking ];
+
+  postPatch = ''
+    patchShebangs --build build-aux/meson_post_install.py
+
+    substituteInPlace uberwriter/config.py --replace "/usr/share/uberwriter" "$out/share/uberwriter"
+
+    # get rid of unused distributed dependencies
+    rm -r uberwriter/{pylocales,pressagio}
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
+      --prefix PATH : "${texliveDist}/bin"
+      --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://uberwriter.github.io/uberwriter/;
+    description = "A distraction free Markdown editor for GNU/Linux";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45007c4431a2..c2019bd61c4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6926,6 +6926,10 @@ in
 
   ua = callPackage ../tools/networking/ua { };
 
+  uberwriter = callPackage ../applications/editors/uberwriter {
+    pythonPackages = python3Packages;
+  };
+
   ubridge = callPackage ../tools/networking/ubridge { };
 
   ucl = callPackage ../development/libraries/ucl { };

From 29bb16a9cd00d48949e5a4eec5029c9bb2544d1f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 13 Jan 2020 15:59:11 +0100
Subject: [PATCH 164/755] way-cooler: Remove

As of 2020-01-09, way-cooler is officially dead:

    http://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html

hence, remove the package and the module.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

docs/release-notes: remove way-cooler

way-cooler: show warnings about removal

Apply suggestions from code review

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>

way-cooler: add suggestion by @Infinisil
---
 nixos/doc/manual/release-notes/rl-2003.xml    |    6 +
 nixos/modules/hardware/opengl.nix             |    6 +-
 nixos/modules/module-list.nix                 |    1 -
 nixos/modules/programs/way-cooler.nix         |   78 -
 nixos/modules/rename.nix                      |    2 +
 .../window-managers/way-cooler/bar.diff       |   37 -
 .../window-managers/way-cooler/crates-io.nix  | 3004 -----------------
 .../window-managers/way-cooler/default.nix    |  113 -
 .../window-managers/way-cooler/way-cooler.nix |  314 --
 .../window-managers/way-cooler/wc-bg.nix      | 1372 --------
 .../window-managers/way-cooler/wc-grab.nix    |  794 -----
 .../window-managers/way-cooler/wc-lock.nix    | 1479 --------
 .../window-managers/way-cooler/wlc.nix        |   39 -
 pkgs/top-level/all-packages.nix               |    3 +-
 14 files changed, 13 insertions(+), 7235 deletions(-)
 delete mode 100644 nixos/modules/programs/way-cooler.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/bar.diff
 delete mode 100644 pkgs/applications/window-managers/way-cooler/crates-io.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/default.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/way-cooler.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/wc-bg.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/wc-grab.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/wc-lock.nix
 delete mode 100644 pkgs/applications/window-managers/way-cooler/wlc.nix

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index ca319dfea411..c8e71acc62b2 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -168,6 +168,12 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
      SDDM, GDM, or using the startx module which uses Xinitrc.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The Way Cooler wayland compositor has been removed, as the project has been officially canceled.
+     There are no more <literal>way-cooler</literal> attribute and <literal>programs.way-cooler</literal> options.
+    </para>
+   </listitem>
    <listitem>
     <para>
       The BEAM package set has been deleted. You will only find there the different interpreters.
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 89dc5008df58..28cddea8b79c 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -43,11 +43,11 @@ in
         description = ''
           Whether to enable OpenGL drivers. This is needed to enable
           OpenGL support in X11 systems, as well as for Wayland compositors
-          like sway, way-cooler and Weston. It is enabled by default
+          like sway and Weston. It is enabled by default
           by the corresponding modules, so you do not usually have to
           set it yourself, only if there is no module for your wayland
-          compositor of choice. See services.xserver.enable,
-          programs.sway.enable, and programs.way-cooler.enable.
+          compositor of choice. See services.xserver.enable and
+          programs.sway.enable.
         '';
         type = types.bool;
         default = false;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a6c1d7c5d66c..b323dd387941 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -158,7 +158,6 @@
   ./programs/venus.nix
   ./programs/vim.nix
   ./programs/wavemon.nix
-  ./programs/way-cooler.nix
   ./programs/waybar.nix
   ./programs/wireshark.nix
   ./programs/x2goserver.nix
diff --git a/nixos/modules/programs/way-cooler.nix b/nixos/modules/programs/way-cooler.nix
deleted file mode 100644
index f27bd42bd764..000000000000
--- a/nixos/modules/programs/way-cooler.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.way-cooler;
-  way-cooler = pkgs.way-cooler;
-
-  wcWrapped = pkgs.writeShellScriptBin "way-cooler" ''
-    ${cfg.extraSessionCommands}
-    exec ${pkgs.dbus}/bin/dbus-run-session ${way-cooler}/bin/way-cooler
-  '';
-  wcJoined = pkgs.symlinkJoin {
-    name = "way-cooler-wrapped";
-    paths = [ wcWrapped way-cooler ];
-  };
-  configFile = readFile "${way-cooler}/etc/way-cooler/init.lua";
-  spawnBar = ''
-    util.program.spawn_at_startup("lemonbar");
-  '';
-in
-{
-  options.programs.way-cooler = {
-    enable = mkEnableOption "way-cooler";
-
-    extraSessionCommands = mkOption {
-      default     = "";
-      type        = types.lines;
-      example = ''
-        export XKB_DEFAULT_LAYOUT=us,de
-        export XKB_DEFAULT_VARIANT=,nodeadkeys
-        export XKB_DEFAULT_OPTIONS=grp:caps_toggle,
-      '';
-      description = ''
-        Shell commands executed just before way-cooler is started.
-      '';
-    };
-
-    extraPackages = mkOption {
-      type = with types; listOf package;
-      default = with pkgs; [
-        westonLite xwayland dmenu
-      ];
-      example = literalExample ''
-        with pkgs; [
-          westonLite xwayland dmenu
-        ]
-      '';
-      description = ''
-        Extra packages to be installed system wide.
-      '';
-    };
-
-    enableBar = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable an unofficial bar.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ wcJoined ] ++ cfg.extraPackages;
-
-    security.pam.services.wc-lock = {};
-    environment.etc."way-cooler/init.lua".text = ''
-      ${configFile}
-      ${optionalString cfg.enableBar spawnBar}
-    '';
-
-    hardware.opengl.enable = mkDefault true;
-    fonts.enableDefaultFonts = mkDefault true;
-    programs.dconf.enable = mkDefault true;
-  };
-
-  meta.maintainers = with maintainers; [ gnidorah ];
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 7109ab5a1099..94b5530192e3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -27,6 +27,8 @@ with lib;
     (mkRemovedOptionModule [ "services.osquery" ] "The osquery module has been removed")
     (mkRemovedOptionModule [ "services.fourStore" ] "The fourStore module has been removed")
     (mkRemovedOptionModule [ "services.fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
+    (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
+      "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
 
     # Do NOT add any option renames here, see top of the file
   ];
diff --git a/pkgs/applications/window-managers/way-cooler/bar.diff b/pkgs/applications/window-managers/way-cooler/bar.diff
deleted file mode 100644
index e60ebabe9833..000000000000
--- a/pkgs/applications/window-managers/way-cooler/bar.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- bar.py.txt.orig	2017-12-05 18:10:20.108569182 +0300
-+++ ./bar.py.txt	2017-12-10 21:42:10.622781945 +0300
-@@ -5,6 +5,7 @@ import datetime
- import json
- from time import sleep
- from pydbus import SessionBus
-+from glob import glob
- 
- BUS = SessionBus()
- LAYOUT = BUS.get(bus_name='org.way-cooler', object_path='/org/way_cooler/Layout')
-@@ -32,7 +33,7 @@ def main():
-             output += func()
-         print(output)
-         sys.stdout.flush()
--        sleep(.1)
-+        sleep(1)
- 
- def get_workspaces(layout_json):
-     """Gets the workspace names from the layout json"""
-@@ -49,9 +50,14 @@ def get_time():
-     return datetime.datetime.now().strftime('  %a %b %d  %H:%M  ')
- 
- def get_battery():
--    with open("/sys/class/power_supply/BAT0/capacity", "r") as f:
--        bat = f.readlines()
--    return bat[0].strip() + "% Battery"
-+    try:
-+        [path] = glob("/sys/class/power_supply/BAT?/capacity")
-+        with open(path, "r") as f:
-+            bat = f.readlines()
-+            result = bat[0].strip() + "% Battery"
-+    except Exception:
-+        result = ""
-+    return result
- 
- def format_workspaces(layout, workspaces, active_workspace):
-     workspaces = "  " + workspaces.replace(" ", "  ") + "  "
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
deleted file mode 100644
index 01638c6332c8..000000000000
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ /dev/null
@@ -1,3004 +0,0 @@
-{ lib, buildRustCrate, buildRustCrateHelpers }:
-with buildRustCrateHelpers;
-let inherit (lib.lists) fold;
-    inherit (lib.attrsets) recursiveUpdate;
-in
-rec {
-
-# aho-corasick-0.5.3
-
-  crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate {
-    crateName = "aho-corasick";
-    version = "0.5.3";
-    description = "Fast multiple substring searching with finite state machines.";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
-    libName = "aho_corasick";
-    crateBin =
-      [{  name = "aho-corasick-dot"; }];
-    dependencies = mapFeatures features ([
-      (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
-    ]);
-  };
-  features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
-    aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
-    memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
-  }) [
-    (features_.memchr."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
-  ];
-
-
-# end
-# bitflags-0.4.0
-
-  crates.bitflags."0.4.0" = deps: { features?(features_.bitflags."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.4.0";
-    description = "A macro to generate structures which behave like bitflags.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
-    features = mkFeatures (features."bitflags"."0.4.0" or {});
-  };
-  features_.bitflags."0.4.0" = deps: f: updateFeatures f ({
-    bitflags."0.4.0".default = (f.bitflags."0.4.0".default or true);
-  }) [];
-
-
-# end
-# bitflags-0.6.0
-
-  crates.bitflags."0.6.0" = deps: { features?(features_.bitflags."0.6.0" deps {}) }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.6.0";
-    description = "A macro to generate structures which behave like bitflags.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
-  };
-  features_.bitflags."0.6.0" = deps: f: updateFeatures f ({
-    bitflags."0.6.0".default = (f.bitflags."0.6.0".default or true);
-  }) [];
-
-
-# end
-# bitflags-0.7.0
-
-  crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.7.0";
-    description = "A macro to generate structures which behave like bitflags.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
-  };
-  features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
-    bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
-  }) [];
-
-
-# end
-# bitflags-0.9.1
-
-  crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.9.1";
-    description = "A macro to generate structures which behave like bitflags.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
-    features = mkFeatures (features."bitflags"."0.9.1" or {});
-  };
-  features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec {
-    bitflags = fold recursiveUpdate {} [
-      { "0.9.1"."example_generated" =
-        (f.bitflags."0.9.1"."example_generated" or false) ||
-        (f.bitflags."0.9.1".default or false) ||
-        (bitflags."0.9.1"."default" or false); }
-      { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
-    ];
-  }) [];
-
-
-# end
-# bitflags-1.0.4
-
-  crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
-    crateName = "bitflags";
-    version = "1.0.4";
-    description = "A macro to generate structures which behave like bitflags.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
-    features = mkFeatures (features."bitflags"."1.0.4" or {});
-  };
-  features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
-    bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
-  }) [];
-
-
-# end
-# c_vec-1.2.1
-
-  crates.c_vec."1.2.1" = deps: { features?(features_.c_vec."1.2.1" deps {}) }: buildRustCrate {
-    crateName = "c_vec";
-    version = "1.2.1";
-    description = "Structures to wrap C arrays";
-    authors = [ "Guillaume Gomez <guillaume1.gomez@gmail.com>" ];
-    sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
-  };
-  features_.c_vec."1.2.1" = deps: f: updateFeatures f ({
-    c_vec."1.2.1".default = (f.c_vec."1.2.1".default or true);
-  }) [];
-
-
-# end
-# cairo-rs-0.2.0
-
-  crates.cairo_rs."0.2.0" = deps: { features?(features_.cairo_rs."0.2.0" deps {}) }: buildRustCrate {
-    crateName = "cairo-rs";
-    version = "0.2.0";
-    description = "Rust bindings for the Cairo library";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd";
-    libName = "cairo";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."c_vec"."${deps."cairo_rs"."0.2.0"."c_vec"}" deps)
-      (crates."cairo_sys_rs"."${deps."cairo_rs"."0.2.0"."cairo_sys_rs"}" deps)
-      (crates."libc"."${deps."cairo_rs"."0.2.0"."libc"}" deps)
-    ]
-      ++ (if features.cairo_rs."0.2.0".glib or false then [ (crates.glib."${deps."cairo_rs"."0.2.0".glib}" deps) ] else [])
-      ++ (if features.cairo_rs."0.2.0".glib-sys or false then [ (crates.glib_sys."${deps."cairo_rs"."0.2.0".glib_sys}" deps) ] else []))
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."cairo_rs"."0.2.0"."winapi"}" deps)
-    ]) else []);
-
-    buildDependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."cairo_rs"."0.2.0" or {});
-  };
-  features_.cairo_rs."0.2.0" = deps: f: updateFeatures f (rec {
-    c_vec."${deps.cairo_rs."0.2.0".c_vec}".default = true;
-    cairo_rs = fold recursiveUpdate {} [
-      { "0.2.0"."glib" =
-        (f.cairo_rs."0.2.0"."glib" or false) ||
-        (f.cairo_rs."0.2.0".use_glib or false) ||
-        (cairo_rs."0.2.0"."use_glib" or false); }
-      { "0.2.0"."glib-sys" =
-        (f.cairo_rs."0.2.0"."glib-sys" or false) ||
-        (f.cairo_rs."0.2.0".use_glib or false) ||
-        (cairo_rs."0.2.0"."use_glib" or false); }
-      { "0.2.0"."gtk-rs-lgpl-docs" =
-        (f.cairo_rs."0.2.0"."gtk-rs-lgpl-docs" or false) ||
-        (f.cairo_rs."0.2.0".embed-lgpl-docs or false) ||
-        (cairo_rs."0.2.0"."embed-lgpl-docs" or false) ||
-        (f.cairo_rs."0.2.0".purge-lgpl-docs or false) ||
-        (cairo_rs."0.2.0"."purge-lgpl-docs" or false); }
-      { "0.2.0"."use_glib" =
-        (f.cairo_rs."0.2.0"."use_glib" or false) ||
-        (f.cairo_rs."0.2.0".default or false) ||
-        (cairo_rs."0.2.0"."default" or false); }
-      { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
-    ];
-    cairo_sys_rs = fold recursiveUpdate {} [
-      { "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."png" =
-        (f.cairo_sys_rs."${deps.cairo_rs."0.2.0".cairo_sys_rs}"."png" or false) ||
-        (cairo_rs."0.2.0"."png" or false) ||
-        (f."cairo_rs"."0.2.0"."png" or false); }
-      { "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."v1_12" =
-        (f.cairo_sys_rs."${deps.cairo_rs."0.2.0".cairo_sys_rs}"."v1_12" or false) ||
-        (cairo_rs."0.2.0"."v1_12" or false) ||
-        (f."cairo_rs"."0.2.0"."v1_12" or false); }
-      { "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."xcb" =
-        (f.cairo_sys_rs."${deps.cairo_rs."0.2.0".cairo_sys_rs}"."xcb" or false) ||
-        (cairo_rs."0.2.0"."xcb" or false) ||
-        (f."cairo_rs"."0.2.0"."xcb" or false); }
-      { "${deps.cairo_rs."0.2.0".cairo_sys_rs}".default = true; }
-    ];
-    glib."${deps.cairo_rs."0.2.0".glib}".default = true;
-    glib_sys."${deps.cairo_rs."0.2.0".glib_sys}".default = true;
-    libc."${deps.cairo_rs."0.2.0".libc}".default = true;
-    winapi."${deps.cairo_rs."0.2.0".winapi}".default = true;
-  }) [
-    (features_.c_vec."${deps."cairo_rs"."0.2.0"."c_vec"}" deps)
-    (features_.cairo_sys_rs."${deps."cairo_rs"."0.2.0"."cairo_sys_rs"}" deps)
-    (features_.glib."${deps."cairo_rs"."0.2.0"."glib"}" deps)
-    (features_.glib_sys."${deps."cairo_rs"."0.2.0"."glib_sys"}" deps)
-    (features_.libc."${deps."cairo_rs"."0.2.0"."libc"}" deps)
-    (features_.winapi."${deps."cairo_rs"."0.2.0"."winapi"}" deps)
-  ];
-
-
-# end
-# cairo-sys-rs-0.4.0
-
-  crates.cairo_sys_rs."0.4.0" = deps: { features?(features_.cairo_sys_rs."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "cairo-sys-rs";
-    version = "0.4.0";
-    description = "FFI bindings to libcairo";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br";
-    libName = "cairo_sys";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."cairo_sys_rs"."0.4.0"."libc"}" deps)
-    ])
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."cairo_sys_rs"."0.4.0"."winapi"}" deps)
-    ]) else []);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."cairo_sys_rs"."0.4.0"."pkg_config"}" deps)
-    ]);
-    features = mkFeatures (features."cairo_sys_rs"."0.4.0" or {});
-  };
-  features_.cairo_sys_rs."0.4.0" = deps: f: updateFeatures f (rec {
-    cairo_sys_rs = fold recursiveUpdate {} [
-      { "0.4.0"."v1_12" =
-        (f.cairo_sys_rs."0.4.0"."v1_12" or false) ||
-        (f.cairo_sys_rs."0.4.0".v1_14 or false) ||
-        (cairo_sys_rs."0.4.0"."v1_14" or false); }
-      { "0.4.0"."x11" =
-        (f.cairo_sys_rs."0.4.0"."x11" or false) ||
-        (f.cairo_sys_rs."0.4.0".xlib or false) ||
-        (cairo_sys_rs."0.4.0"."xlib" or false); }
-      { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
-    ];
-    libc."${deps.cairo_sys_rs."0.4.0".libc}".default = true;
-    pkg_config."${deps.cairo_sys_rs."0.4.0".pkg_config}".default = true;
-    winapi."${deps.cairo_sys_rs."0.4.0".winapi}".default = true;
-  }) [
-    (features_.libc."${deps."cairo_sys_rs"."0.4.0"."libc"}" deps)
-    (features_.pkg_config."${deps."cairo_sys_rs"."0.4.0"."pkg_config"}" deps)
-    (features_.winapi."${deps."cairo_sys_rs"."0.4.0"."winapi"}" deps)
-  ];
-
-
-# end
-# cc-1.0.25
-
-  crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.25";
-    description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
-    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"."rayon" =
-        (f.cc."1.0.25"."rayon" or false) ||
-        (f.cc."1.0.25".parallel or false) ||
-        (cc."1.0.25"."parallel" or false); }
-      { "1.0.25".default = (f.cc."1.0.25".default or true); }
-    ];
-  }) [];
-
-
-# end
-# cfg-if-0.1.6
-
-  crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
-    crateName = "cfg-if";
-    version = "0.1.6";
-    description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
-  };
-  features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({
-    cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
-  }) [];
-
-
-# end
-# cloudabi-0.0.3
-
-  crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate {
-    crateName = "cloudabi";
-    version = "0.0.3";
-    description = "Low level interface to CloudABI. Contains all syscalls and related types.";
-    authors = [ "Nuxi (https://nuxi.nl/) and contributors" ];
-    sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5";
-    libPath = "cloudabi.rs";
-    dependencies = mapFeatures features ([
-    ]
-      ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else []));
-    features = mkFeatures (features."cloudabi"."0.0.3" or {});
-  };
-  features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true;
-    cloudabi = fold recursiveUpdate {} [
-      { "0.0.3"."bitflags" =
-        (f.cloudabi."0.0.3"."bitflags" or false) ||
-        (f.cloudabi."0.0.3".default or false) ||
-        (cloudabi."0.0.3"."default" or false); }
-      { "0.0.3".default = (f.cloudabi."0.0.3".default or true); }
-    ];
-  }) [
-    (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps)
-  ];
-
-
-# end
-# dbus-0.4.1
-
-  crates.dbus."0.4.1" = deps: { features?(features_.dbus."0.4.1" deps {}) }: buildRustCrate {
-    crateName = "dbus";
-    version = "0.4.1";
-    description = "Bindings to D-Bus, which is a bus commonly used on Linux for inter-process communication.";
-    authors = [ "David Henningsson <diwic@ubuntu.com>" ];
-    sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."dbus"."0.4.1"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."dbus"."0.4.1"."pkg_config"}" deps)
-    ]);
-  };
-  features_.dbus."0.4.1" = deps: f: updateFeatures f ({
-    dbus."0.4.1".default = (f.dbus."0.4.1".default or true);
-    libc."${deps.dbus."0.4.1".libc}".default = true;
-    pkg_config."${deps.dbus."0.4.1".pkg_config}".default = true;
-  }) [
-    (features_.libc."${deps."dbus"."0.4.1"."libc"}" deps)
-    (features_.pkg_config."${deps."dbus"."0.4.1"."pkg_config"}" deps)
-  ];
-
-
-# end
-# dbus-macros-0.0.6
-
-  crates.dbus_macros."0.0.6" = deps: { features?(features_.dbus_macros."0.0.6" deps {}) }: buildRustCrate {
-    crateName = "dbus-macros";
-    version = "0.0.6";
-    description = "Convenient macros to use the dbus crate";
-    authors = [ "Antoni Boucher <bouanto@zoho.com>" ];
-    sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
-    dependencies = mapFeatures features ([
-      (crates."dbus"."${deps."dbus_macros"."0.0.6"."dbus"}" deps)
-    ]);
-  };
-  features_.dbus_macros."0.0.6" = deps: f: updateFeatures f ({
-    dbus."${deps.dbus_macros."0.0.6".dbus}".default = true;
-    dbus_macros."0.0.6".default = (f.dbus_macros."0.0.6".default or true);
-  }) [
-    (features_.dbus."${deps."dbus_macros"."0.0.6"."dbus"}" deps)
-  ];
-
-
-# end
-# dlib-0.3.1
-
-  crates.dlib."0.3.1" = deps: { features?(features_.dlib."0.3.1" deps {}) }: buildRustCrate {
-    crateName = "dlib";
-    version = "0.3.1";
-    description = "Helper macros for handling manually loading optionnal system libraries.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
-    dependencies = mapFeatures features ([
-      (crates."libloading"."${deps."dlib"."0.3.1"."libloading"}" deps)
-    ]);
-    features = mkFeatures (features."dlib"."0.3.1" or {});
-  };
-  features_.dlib."0.3.1" = deps: f: updateFeatures f ({
-    dlib."0.3.1".default = (f.dlib."0.3.1".default or true);
-    libloading."${deps.dlib."0.3.1".libloading}".default = true;
-  }) [
-    (features_.libloading."${deps."dlib"."0.3.1"."libloading"}" deps)
-  ];
-
-
-# end
-# dlib-0.4.1
-
-  crates.dlib."0.4.1" = deps: { features?(features_.dlib."0.4.1" deps {}) }: buildRustCrate {
-    crateName = "dlib";
-    version = "0.4.1";
-    description = "Helper macros for handling manually loading optional system libraries.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "0h5xm6lanbl6v9y16g592bia33g7xb0n0fg98pvz6nsvg0layxlk";
-    dependencies = mapFeatures features ([
-      (crates."libloading"."${deps."dlib"."0.4.1"."libloading"}" deps)
-    ]);
-    features = mkFeatures (features."dlib"."0.4.1" or {});
-  };
-  features_.dlib."0.4.1" = deps: f: updateFeatures f ({
-    dlib."0.4.1".default = (f.dlib."0.4.1".default or true);
-    libloading."${deps.dlib."0.4.1".libloading}".default = true;
-  }) [
-    (features_.libloading."${deps."dlib"."0.4.1"."libloading"}" deps)
-  ];
-
-
-# end
-# dtoa-0.4.3
-
-  crates.dtoa."0.4.3" = deps: { features?(features_.dtoa."0.4.3" deps {}) }: buildRustCrate {
-    crateName = "dtoa";
-    version = "0.4.3";
-    description = "Fast functions for printing floating-point primitives to an io::Write";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
-  };
-  features_.dtoa."0.4.3" = deps: f: updateFeatures f ({
-    dtoa."0.4.3".default = (f.dtoa."0.4.3".default or true);
-  }) [];
-
-
-# end
-# dummy-rustwlc-0.7.1
-
-  crates.dummy_rustwlc."0.7.1" = deps: { features?(features_.dummy_rustwlc."0.7.1" deps {}) }: buildRustCrate {
-    crateName = "dummy-rustwlc";
-    version = "0.7.1";
-    description = "A dummy version of the functions defined in rust-wlc, to be used in testing and for travis builds";
-    authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Preston Carpenter <APragmaticPlace@gmail.com>" ];
-    sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."dummy_rustwlc"."0.7.1"."bitflags"}" deps)
-      (crates."libc"."${deps."dummy_rustwlc"."0.7.1"."libc"}" deps)
-      (crates."wayland_sys"."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps)
-    ]);
-  };
-  features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f ({
-    bitflags."${deps.dummy_rustwlc."0.7.1".bitflags}".default = true;
-    dummy_rustwlc."0.7.1".default = (f.dummy_rustwlc."0.7.1".default or true);
-    libc."${deps.dummy_rustwlc."0.7.1".libc}".default = true;
-    wayland_sys = fold recursiveUpdate {} [
-      { "${deps.dummy_rustwlc."0.7.1".wayland_sys}"."dlopen" = true; }
-      { "${deps.dummy_rustwlc."0.7.1".wayland_sys}"."server" = true; }
-      { "${deps.dummy_rustwlc."0.7.1".wayland_sys}".default = true; }
-    ];
-  }) [
-    (features_.bitflags."${deps."dummy_rustwlc"."0.7.1"."bitflags"}" deps)
-    (features_.libc."${deps."dummy_rustwlc"."0.7.1"."libc"}" deps)
-    (features_.wayland_sys."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps)
-  ];
-
-
-# end
-# env_logger-0.3.5
-
-  crates.env_logger."0.3.5" = deps: { features?(features_.env_logger."0.3.5" deps {}) }: buildRustCrate {
-    crateName = "env_logger";
-    version = "0.3.5";
-    description = "An logging implementation for `log` which is configured via an environment\nvariable.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
-    dependencies = mapFeatures features ([
-      (crates."log"."${deps."env_logger"."0.3.5"."log"}" deps)
-    ]
-      ++ (if features.env_logger."0.3.5".regex or false then [ (crates.regex."${deps."env_logger"."0.3.5".regex}" deps) ] else []));
-    features = mkFeatures (features."env_logger"."0.3.5" or {});
-  };
-  features_.env_logger."0.3.5" = deps: f: updateFeatures f (rec {
-    env_logger = fold recursiveUpdate {} [
-      { "0.3.5"."regex" =
-        (f.env_logger."0.3.5"."regex" or false) ||
-        (f.env_logger."0.3.5".default or false) ||
-        (env_logger."0.3.5"."default" or false); }
-      { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
-    ];
-    log."${deps.env_logger."0.3.5".log}".default = true;
-    regex."${deps.env_logger."0.3.5".regex}".default = true;
-  }) [
-    (features_.log."${deps."env_logger"."0.3.5"."log"}" deps)
-    (features_.regex."${deps."env_logger"."0.3.5"."regex"}" deps)
-  ];
-
-
-# end
-# fixedbitset-0.1.9
-
-  crates.fixedbitset."0.1.9" = deps: { features?(features_.fixedbitset."0.1.9" deps {}) }: buildRustCrate {
-    crateName = "fixedbitset";
-    version = "0.1.9";
-    description = "FixedBitSet is a simple bitset collection";
-    authors = [ "bluss" ];
-    sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
-  };
-  features_.fixedbitset."0.1.9" = deps: f: updateFeatures f ({
-    fixedbitset."0.1.9".default = (f.fixedbitset."0.1.9".default or true);
-  }) [];
-
-
-# end
-# fuchsia-zircon-0.3.3
-
-  crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
-    crateName = "fuchsia-zircon";
-    version = "0.3.3";
-    description = "Rust bindings for the Zircon kernel";
-    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 ({
-    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)
-  ];
-
-
-# end
-# fuchsia-zircon-sys-0.3.3
-
-  crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
-    crateName = "fuchsia-zircon-sys";
-    version = "0.3.3";
-    description = "Low-level Rust bindings for the Zircon kernel";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
-  };
-  features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
-    fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
-  }) [];
-
-
-# end
-# gcc-0.3.55
-
-  crates.gcc."0.3.55" = deps: { features?(features_.gcc."0.3.55" deps {}) }: buildRustCrate {
-    crateName = "gcc";
-    version = "0.3.55";
-    description = "**Deprecated** crate, renamed to `cc`\n\nA build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "18qxv3hjdhp7pfcvbm2hvyicpgmk7xw8aii1l7fla8cxxbcrg2nz";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."gcc"."0.3.55" or {});
-  };
-  features_.gcc."0.3.55" = deps: f: updateFeatures f (rec {
-    gcc = fold recursiveUpdate {} [
-      { "0.3.55"."rayon" =
-        (f.gcc."0.3.55"."rayon" or false) ||
-        (f.gcc."0.3.55".parallel or false) ||
-        (gcc."0.3.55"."parallel" or false); }
-      { "0.3.55".default = (f.gcc."0.3.55".default or true); }
-    ];
-  }) [];
-
-
-# end
-# gdk-pixbuf-0.2.0
-
-  crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate {
-    crateName = "gdk-pixbuf";
-    version = "0.2.0";
-    description = "Rust bindings for the GdkPixbuf library";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
-    libName = "gdk_pixbuf";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."gdk_pixbuf_sys"."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-      (crates."glib"."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
-      (crates."glib_sys"."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
-      (crates."libc"."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."gdk_pixbuf"."0.2.0" or {});
-  };
-  features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
-    gdk_pixbuf = fold recursiveUpdate {} [
-      { "0.2.0"."gtk-rs-lgpl-docs" =
-        (f.gdk_pixbuf."0.2.0"."gtk-rs-lgpl-docs" or false) ||
-        (f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) ||
-        (gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
-        (f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) ||
-        (gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); }
-      { "0.2.0"."v2_28" =
-        (f.gdk_pixbuf."0.2.0"."v2_28" or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_30" or false); }
-      { "0.2.0"."v2_30" =
-        (f.gdk_pixbuf."0.2.0"."v2_30" or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_32" or false); }
-      { "0.2.0"."v2_32" =
-        (f.gdk_pixbuf."0.2.0"."v2_32" or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_36 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_36" or false); }
-      { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
-    ];
-    gdk_pixbuf_sys = fold recursiveUpdate {} [
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_28" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_28" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_30" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_30" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_32" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_32" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_36" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_36" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; }
-    ];
-    glib."${deps.gdk_pixbuf."0.2.0".glib}".default = true;
-    glib_sys."${deps.gdk_pixbuf."0.2.0".glib_sys}".default = true;
-    gobject_sys."${deps.gdk_pixbuf."0.2.0".gobject_sys}".default = true;
-    libc."${deps.gdk_pixbuf."0.2.0".libc}".default = true;
-  }) [
-    (features_.gdk_pixbuf_sys."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-    (features_.glib."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
-    (features_.glib_sys."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
-    (features_.libc."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
-  ];
-
-
-# end
-# gdk-pixbuf-sys-0.4.0
-
-  crates.gdk_pixbuf_sys."0.4.0" = deps: { features?(features_.gdk_pixbuf_sys."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "gdk-pixbuf-sys";
-    version = "0.4.0";
-    description = "FFI bindings to libgdk_pixbuf-2.0";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp";
-    libName = "gdk_pixbuf_sys";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."gdk_pixbuf_sys"."0.4.0"."bitflags"}" deps)
-      (crates."gio_sys"."${deps."gdk_pixbuf_sys"."0.4.0"."gio_sys"}" deps)
-      (crates."glib_sys"."${deps."gdk_pixbuf_sys"."0.4.0"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."gdk_pixbuf_sys"."0.4.0"."gobject_sys"}" deps)
-      (crates."libc"."${deps."gdk_pixbuf_sys"."0.4.0"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."gdk_pixbuf_sys"."0.4.0"."pkg_config"}" deps)
-    ]);
-    features = mkFeatures (features."gdk_pixbuf_sys"."0.4.0" or {});
-  };
-  features_.gdk_pixbuf_sys."0.4.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.gdk_pixbuf_sys."0.4.0".bitflags}".default = true;
-    gdk_pixbuf_sys = fold recursiveUpdate {} [
-      { "0.4.0"."v2_28" =
-        (f.gdk_pixbuf_sys."0.4.0"."v2_28" or false) ||
-        (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
-        (gdk_pixbuf_sys."0.4.0"."v2_30" or false); }
-      { "0.4.0"."v2_30" =
-        (f.gdk_pixbuf_sys."0.4.0"."v2_30" or false) ||
-        (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
-        (gdk_pixbuf_sys."0.4.0"."v2_32" or false); }
-      { "0.4.0"."v2_32" =
-        (f.gdk_pixbuf_sys."0.4.0"."v2_32" or false) ||
-        (f.gdk_pixbuf_sys."0.4.0".v2_36 or false) ||
-        (gdk_pixbuf_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
-    ];
-    gio_sys."${deps.gdk_pixbuf_sys."0.4.0".gio_sys}".default = true;
-    glib_sys."${deps.gdk_pixbuf_sys."0.4.0".glib_sys}".default = true;
-    gobject_sys."${deps.gdk_pixbuf_sys."0.4.0".gobject_sys}".default = true;
-    libc."${deps.gdk_pixbuf_sys."0.4.0".libc}".default = true;
-    pkg_config."${deps.gdk_pixbuf_sys."0.4.0".pkg_config}".default = true;
-  }) [
-    (features_.bitflags."${deps."gdk_pixbuf_sys"."0.4.0"."bitflags"}" deps)
-    (features_.gio_sys."${deps."gdk_pixbuf_sys"."0.4.0"."gio_sys"}" deps)
-    (features_.glib_sys."${deps."gdk_pixbuf_sys"."0.4.0"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."gdk_pixbuf_sys"."0.4.0"."gobject_sys"}" deps)
-    (features_.libc."${deps."gdk_pixbuf_sys"."0.4.0"."libc"}" deps)
-    (features_.pkg_config."${deps."gdk_pixbuf_sys"."0.4.0"."pkg_config"}" deps)
-  ];
-
-
-# end
-# getopts-0.2.18
-
-  crates.getopts."0.2.18" = deps: { features?(features_.getopts."0.2.18" deps {}) }: buildRustCrate {
-    crateName = "getopts";
-    version = "0.2.18";
-    description = "getopts-like option parsing.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0c1m95wg8pkvdq4mwcd2v78r1lb6a5s3ljm7158dsl56mvzcwd5y";
-    dependencies = mapFeatures features ([
-      (crates."unicode_width"."${deps."getopts"."0.2.18"."unicode_width"}" deps)
-    ]);
-  };
-  features_.getopts."0.2.18" = deps: f: updateFeatures f ({
-    getopts."0.2.18".default = (f.getopts."0.2.18".default or true);
-    unicode_width."${deps.getopts."0.2.18".unicode_width}".default = true;
-  }) [
-    (features_.unicode_width."${deps."getopts"."0.2.18"."unicode_width"}" deps)
-  ];
-
-
-# end
-# gio-sys-0.4.0
-
-  crates.gio_sys."0.4.0" = deps: { features?(features_.gio_sys."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "gio-sys";
-    version = "0.4.0";
-    description = "FFI bindings to libgio-2.0";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l";
-    libName = "gio_sys";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."gio_sys"."0.4.0"."bitflags"}" deps)
-      (crates."glib_sys"."${deps."gio_sys"."0.4.0"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."gio_sys"."0.4.0"."gobject_sys"}" deps)
-      (crates."libc"."${deps."gio_sys"."0.4.0"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."gio_sys"."0.4.0"."pkg_config"}" deps)
-    ]);
-    features = mkFeatures (features."gio_sys"."0.4.0" or {});
-  };
-  features_.gio_sys."0.4.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.gio_sys."0.4.0".bitflags}".default = true;
-    gio_sys = fold recursiveUpdate {} [
-      { "0.4.0"."v2_34" =
-        (f.gio_sys."0.4.0"."v2_34" or false) ||
-        (f.gio_sys."0.4.0".v2_36 or false) ||
-        (gio_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0"."v2_36" =
-        (f.gio_sys."0.4.0"."v2_36" or false) ||
-        (f.gio_sys."0.4.0".v2_38 or false) ||
-        (gio_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0"."v2_38" =
-        (f.gio_sys."0.4.0"."v2_38" or false) ||
-        (f.gio_sys."0.4.0".v2_40 or false) ||
-        (gio_sys."0.4.0"."v2_40" or false); }
-      { "0.4.0"."v2_40" =
-        (f.gio_sys."0.4.0"."v2_40" or false) ||
-        (f.gio_sys."0.4.0".v2_42 or false) ||
-        (gio_sys."0.4.0"."v2_42" or false); }
-      { "0.4.0"."v2_42" =
-        (f.gio_sys."0.4.0"."v2_42" or false) ||
-        (f.gio_sys."0.4.0".v2_44 or false) ||
-        (gio_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0"."v2_44" =
-        (f.gio_sys."0.4.0"."v2_44" or false) ||
-        (f.gio_sys."0.4.0".v2_46 or false) ||
-        (gio_sys."0.4.0"."v2_46" or false); }
-      { "0.4.0"."v2_46" =
-        (f.gio_sys."0.4.0"."v2_46" or false) ||
-        (f.gio_sys."0.4.0".v2_48 or false) ||
-        (gio_sys."0.4.0"."v2_48" or false); }
-      { "0.4.0"."v2_48" =
-        (f.gio_sys."0.4.0"."v2_48" or false) ||
-        (f.gio_sys."0.4.0".v2_50 or false) ||
-        (gio_sys."0.4.0"."v2_50" or false); }
-      { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
-    ];
-    glib_sys."${deps.gio_sys."0.4.0".glib_sys}".default = true;
-    gobject_sys."${deps.gio_sys."0.4.0".gobject_sys}".default = true;
-    libc."${deps.gio_sys."0.4.0".libc}".default = true;
-    pkg_config."${deps.gio_sys."0.4.0".pkg_config}".default = true;
-  }) [
-    (features_.bitflags."${deps."gio_sys"."0.4.0"."bitflags"}" deps)
-    (features_.glib_sys."${deps."gio_sys"."0.4.0"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."gio_sys"."0.4.0"."gobject_sys"}" deps)
-    (features_.libc."${deps."gio_sys"."0.4.0"."libc"}" deps)
-    (features_.pkg_config."${deps."gio_sys"."0.4.0"."pkg_config"}" deps)
-  ];
-
-
-# end
-# glib-0.3.1
-
-  crates.glib."0.3.1" = deps: { features?(features_.glib."0.3.1" deps {}) }: buildRustCrate {
-    crateName = "glib";
-    version = "0.3.1";
-    description = "Rust bindings for the GLib library";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."glib"."0.3.1"."bitflags"}" deps)
-      (crates."glib_sys"."${deps."glib"."0.3.1"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."glib"."0.3.1"."gobject_sys"}" deps)
-      (crates."lazy_static"."${deps."glib"."0.3.1"."lazy_static"}" deps)
-      (crates."libc"."${deps."glib"."0.3.1"."libc"}" deps)
-    ]);
-    features = mkFeatures (features."glib"."0.3.1" or {});
-  };
-  features_.glib."0.3.1" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.glib."0.3.1".bitflags}".default = true;
-    glib = fold recursiveUpdate {} [
-      { "0.3.1"."v2_34" =
-        (f.glib."0.3.1"."v2_34" or false) ||
-        (f.glib."0.3.1".v2_38 or false) ||
-        (glib."0.3.1"."v2_38" or false); }
-      { "0.3.1"."v2_38" =
-        (f.glib."0.3.1"."v2_38" or false) ||
-        (f.glib."0.3.1".v2_40 or false) ||
-        (glib."0.3.1"."v2_40" or false); }
-      { "0.3.1"."v2_40" =
-        (f.glib."0.3.1"."v2_40" or false) ||
-        (f.glib."0.3.1".v2_44 or false) ||
-        (glib."0.3.1"."v2_44" or false); }
-      { "0.3.1"."v2_44" =
-        (f.glib."0.3.1"."v2_44" or false) ||
-        (f.glib."0.3.1".v2_46 or false) ||
-        (glib."0.3.1"."v2_46" or false); }
-      { "0.3.1"."v2_46" =
-        (f.glib."0.3.1"."v2_46" or false) ||
-        (f.glib."0.3.1".v2_48 or false) ||
-        (glib."0.3.1"."v2_48" or false); }
-      { "0.3.1"."v2_48" =
-        (f.glib."0.3.1"."v2_48" or false) ||
-        (f.glib."0.3.1".v2_50 or false) ||
-        (glib."0.3.1"."v2_50" or false); }
-      { "0.3.1".default = (f.glib."0.3.1".default or true); }
-    ];
-    glib_sys = fold recursiveUpdate {} [
-      { "${deps.glib."0.3.1".glib_sys}"."v2_34" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_34" or false) ||
-        (glib."0.3.1"."v2_34" or false) ||
-        (f."glib"."0.3.1"."v2_34" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_38" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_38" or false) ||
-        (glib."0.3.1"."v2_38" or false) ||
-        (f."glib"."0.3.1"."v2_38" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_40" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_40" or false) ||
-        (glib."0.3.1"."v2_40" or false) ||
-        (f."glib"."0.3.1"."v2_40" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_44" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_44" or false) ||
-        (glib."0.3.1"."v2_44" or false) ||
-        (f."glib"."0.3.1"."v2_44" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_46" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_46" or false) ||
-        (glib."0.3.1"."v2_46" or false) ||
-        (f."glib"."0.3.1"."v2_46" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_48" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_48" or false) ||
-        (glib."0.3.1"."v2_48" or false) ||
-        (f."glib"."0.3.1"."v2_48" or false); }
-      { "${deps.glib."0.3.1".glib_sys}"."v2_50" =
-        (f.glib_sys."${deps.glib."0.3.1".glib_sys}"."v2_50" or false) ||
-        (glib."0.3.1"."v2_50" or false) ||
-        (f."glib"."0.3.1"."v2_50" or false); }
-      { "${deps.glib."0.3.1".glib_sys}".default = true; }
-    ];
-    gobject_sys = fold recursiveUpdate {} [
-      { "${deps.glib."0.3.1".gobject_sys}"."v2_34" =
-        (f.gobject_sys."${deps.glib."0.3.1".gobject_sys}"."v2_34" or false) ||
-        (glib."0.3.1"."v2_34" or false) ||
-        (f."glib"."0.3.1"."v2_34" or false); }
-      { "${deps.glib."0.3.1".gobject_sys}"."v2_38" =
-        (f.gobject_sys."${deps.glib."0.3.1".gobject_sys}"."v2_38" or false) ||
-        (glib."0.3.1"."v2_38" or false) ||
-        (f."glib"."0.3.1"."v2_38" or false); }
-      { "${deps.glib."0.3.1".gobject_sys}"."v2_44" =
-        (f.gobject_sys."${deps.glib."0.3.1".gobject_sys}"."v2_44" or false) ||
-        (glib."0.3.1"."v2_44" or false) ||
-        (f."glib"."0.3.1"."v2_44" or false); }
-      { "${deps.glib."0.3.1".gobject_sys}"."v2_46" =
-        (f.gobject_sys."${deps.glib."0.3.1".gobject_sys}"."v2_46" or false) ||
-        (glib."0.3.1"."v2_46" or false) ||
-        (f."glib"."0.3.1"."v2_46" or false); }
-      { "${deps.glib."0.3.1".gobject_sys}".default = true; }
-    ];
-    lazy_static."${deps.glib."0.3.1".lazy_static}".default = true;
-    libc."${deps.glib."0.3.1".libc}".default = true;
-  }) [
-    (features_.bitflags."${deps."glib"."0.3.1"."bitflags"}" deps)
-    (features_.glib_sys."${deps."glib"."0.3.1"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."glib"."0.3.1"."gobject_sys"}" deps)
-    (features_.lazy_static."${deps."glib"."0.3.1"."lazy_static"}" deps)
-    (features_.libc."${deps."glib"."0.3.1"."libc"}" deps)
-  ];
-
-
-# end
-# glib-sys-0.4.0
-
-  crates.glib_sys."0.4.0" = deps: { features?(features_.glib_sys."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "glib-sys";
-    version = "0.4.0";
-    description = "FFI bindings to libglib-2.0";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w";
-    libName = "glib_sys";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."glib_sys"."0.4.0"."bitflags"}" deps)
-      (crates."libc"."${deps."glib_sys"."0.4.0"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."glib_sys"."0.4.0"."pkg_config"}" deps)
-    ]);
-    features = mkFeatures (features."glib_sys"."0.4.0" or {});
-  };
-  features_.glib_sys."0.4.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.glib_sys."0.4.0".bitflags}".default = true;
-    glib_sys = fold recursiveUpdate {} [
-      { "0.4.0"."v2_34" =
-        (f.glib_sys."0.4.0"."v2_34" or false) ||
-        (f.glib_sys."0.4.0".v2_36 or false) ||
-        (glib_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0"."v2_36" =
-        (f.glib_sys."0.4.0"."v2_36" or false) ||
-        (f.glib_sys."0.4.0".v2_38 or false) ||
-        (glib_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0"."v2_38" =
-        (f.glib_sys."0.4.0"."v2_38" or false) ||
-        (f.glib_sys."0.4.0".v2_40 or false) ||
-        (glib_sys."0.4.0"."v2_40" or false); }
-      { "0.4.0"."v2_40" =
-        (f.glib_sys."0.4.0"."v2_40" or false) ||
-        (f.glib_sys."0.4.0".v2_44 or false) ||
-        (glib_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0"."v2_44" =
-        (f.glib_sys."0.4.0"."v2_44" or false) ||
-        (f.glib_sys."0.4.0".v2_46 or false) ||
-        (glib_sys."0.4.0"."v2_46" or false); }
-      { "0.4.0"."v2_46" =
-        (f.glib_sys."0.4.0"."v2_46" or false) ||
-        (f.glib_sys."0.4.0".v2_48 or false) ||
-        (glib_sys."0.4.0"."v2_48" or false); }
-      { "0.4.0"."v2_48" =
-        (f.glib_sys."0.4.0"."v2_48" or false) ||
-        (f.glib_sys."0.4.0".v2_50 or false) ||
-        (glib_sys."0.4.0"."v2_50" or false); }
-      { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
-    ];
-    libc."${deps.glib_sys."0.4.0".libc}".default = true;
-    pkg_config."${deps.glib_sys."0.4.0".pkg_config}".default = true;
-  }) [
-    (features_.bitflags."${deps."glib_sys"."0.4.0"."bitflags"}" deps)
-    (features_.libc."${deps."glib_sys"."0.4.0"."libc"}" deps)
-    (features_.pkg_config."${deps."glib_sys"."0.4.0"."pkg_config"}" deps)
-  ];
-
-
-# end
-# gobject-sys-0.4.0
-
-  crates.gobject_sys."0.4.0" = deps: { features?(features_.gobject_sys."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "gobject-sys";
-    version = "0.4.0";
-    description = "FFI bindings to libgobject-2.0";
-    authors = [ "The Gtk-rs Project Developers" ];
-    sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli";
-    libName = "gobject_sys";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."gobject_sys"."0.4.0"."bitflags"}" deps)
-      (crates."glib_sys"."${deps."gobject_sys"."0.4.0"."glib_sys"}" deps)
-      (crates."libc"."${deps."gobject_sys"."0.4.0"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."pkg_config"."${deps."gobject_sys"."0.4.0"."pkg_config"}" deps)
-    ]);
-    features = mkFeatures (features."gobject_sys"."0.4.0" or {});
-  };
-  features_.gobject_sys."0.4.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.gobject_sys."0.4.0".bitflags}".default = true;
-    glib_sys."${deps.gobject_sys."0.4.0".glib_sys}".default = true;
-    gobject_sys = fold recursiveUpdate {} [
-      { "0.4.0"."v2_34" =
-        (f.gobject_sys."0.4.0"."v2_34" or false) ||
-        (f.gobject_sys."0.4.0".v2_36 or false) ||
-        (gobject_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0"."v2_36" =
-        (f.gobject_sys."0.4.0"."v2_36" or false) ||
-        (f.gobject_sys."0.4.0".v2_38 or false) ||
-        (gobject_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0"."v2_38" =
-        (f.gobject_sys."0.4.0"."v2_38" or false) ||
-        (f.gobject_sys."0.4.0".v2_42 or false) ||
-        (gobject_sys."0.4.0"."v2_42" or false); }
-      { "0.4.0"."v2_42" =
-        (f.gobject_sys."0.4.0"."v2_42" or false) ||
-        (f.gobject_sys."0.4.0".v2_44 or false) ||
-        (gobject_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0"."v2_44" =
-        (f.gobject_sys."0.4.0"."v2_44" or false) ||
-        (f.gobject_sys."0.4.0".v2_46 or false) ||
-        (gobject_sys."0.4.0"."v2_46" or false); }
-      { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
-    ];
-    libc."${deps.gobject_sys."0.4.0".libc}".default = true;
-    pkg_config."${deps.gobject_sys."0.4.0".pkg_config}".default = true;
-  }) [
-    (features_.bitflags."${deps."gobject_sys"."0.4.0"."bitflags"}" deps)
-    (features_.glib_sys."${deps."gobject_sys"."0.4.0"."glib_sys"}" deps)
-    (features_.libc."${deps."gobject_sys"."0.4.0"."libc"}" deps)
-    (features_.pkg_config."${deps."gobject_sys"."0.4.0"."pkg_config"}" deps)
-  ];
-
-
-# end
-# itoa-0.3.4
-
-  crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.3.4";
-    description = "Fast functions for printing integer primitives to an io::Write";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
-    features = mkFeatures (features."itoa"."0.3.4" or {});
-  };
-  features_.itoa."0.3.4" = deps: f: updateFeatures f ({
-    itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
-  }) [];
-
-
-# end
-# json_macro-0.1.1
-
-  crates.json_macro."0.1.1" = deps: { features?(features_.json_macro."0.1.1" deps {}) }: buildRustCrate {
-    crateName = "json_macro";
-    version = "0.1.1";
-    description = "Pure json macro for rust_serialize. No need compiler features.";
-    authors = [ "Denis Kolodin <deniskolodin@gmail.com>" ];
-    sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
-    dependencies = mapFeatures features ([
-      (crates."rustc_serialize"."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps)
-    ]);
-  };
-  features_.json_macro."0.1.1" = deps: f: updateFeatures f ({
-    json_macro."0.1.1".default = (f.json_macro."0.1.1".default or true);
-    rustc_serialize."${deps.json_macro."0.1.1".rustc_serialize}".default = true;
-  }) [
-    (features_.rustc_serialize."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps)
-  ];
-
-
-# end
-# kernel32-sys-0.2.2
-
-  crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants.";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
-    ]);
-  };
-  features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
-    kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
-    winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
-    winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
-  }) [
-    (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps)
-    (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
-  ];
-
-
-# end
-# lazy_static-0.2.11
-
-  crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "0.2.11";
-    description = "A macro for declaring lazily evaluated statics in Rust.";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."lazy_static"."0.2.11" or {});
-  };
-  features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec {
-    lazy_static = fold recursiveUpdate {} [
-      { "0.2.11"."compiletest_rs" =
-        (f.lazy_static."0.2.11"."compiletest_rs" or false) ||
-        (f.lazy_static."0.2.11".compiletest or false) ||
-        (lazy_static."0.2.11"."compiletest" or false); }
-      { "0.2.11"."nightly" =
-        (f.lazy_static."0.2.11"."nightly" or false) ||
-        (f.lazy_static."0.2.11".spin_no_std or false) ||
-        (lazy_static."0.2.11"."spin_no_std" or false); }
-      { "0.2.11"."spin" =
-        (f.lazy_static."0.2.11"."spin" or false) ||
-        (f.lazy_static."0.2.11".spin_no_std or false) ||
-        (lazy_static."0.2.11"."spin_no_std" or false); }
-      { "0.2.11".default = (f.lazy_static."0.2.11".default or true); }
-    ];
-  }) [];
-
-
-# end
-# lazy_static-1.2.0
-
-  crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "1.2.0";
-    description = "A macro for declaring lazily evaluated statics in Rust.";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."lazy_static"."1.2.0" or {});
-  };
-  features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec {
-    lazy_static = fold recursiveUpdate {} [
-      { "1.2.0"."spin" =
-        (f.lazy_static."1.2.0"."spin" or false) ||
-        (f.lazy_static."1.2.0".spin_no_std or false) ||
-        (lazy_static."1.2.0"."spin_no_std" or false); }
-      { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
-    ];
-  }) [];
-
-
-# end
-# libc-0.2.44
-
-  crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.44";
-    description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."libc"."0.2.44" or {});
-  };
-  features_.libc."0.2.44" = deps: f: updateFeatures f (rec {
-    libc = fold recursiveUpdate {} [
-      { "0.2.44"."align" =
-        (f.libc."0.2.44"."align" or false) ||
-        (f.libc."0.2.44".rustc-dep-of-std or false) ||
-        (libc."0.2.44"."rustc-dep-of-std" or false); }
-      { "0.2.44"."rustc-std-workspace-core" =
-        (f.libc."0.2.44"."rustc-std-workspace-core" or false) ||
-        (f.libc."0.2.44".rustc-dep-of-std or false) ||
-        (libc."0.2.44"."rustc-dep-of-std" or false); }
-      { "0.2.44"."use_std" =
-        (f.libc."0.2.44"."use_std" or false) ||
-        (f.libc."0.2.44".default or false) ||
-        (libc."0.2.44"."default" or false); }
-      { "0.2.44".default = (f.libc."0.2.44".default or true); }
-    ];
-  }) [];
-
-
-# end
-# libloading-0.3.4
-
-  crates.libloading."0.3.4" = deps: { features?(features_.libloading."0.3.4" deps {}) }: buildRustCrate {
-    crateName = "libloading";
-    version = "0.3.4";
-    description = "A safer binding to platform’s dynamic library loading utilities";
-    authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
-    sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."lazy_static"."${deps."libloading"."0.3.4"."lazy_static"}" deps)
-    ])
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."kernel32_sys"."${deps."libloading"."0.3.4"."kernel32_sys"}" deps)
-      (crates."winapi"."${deps."libloading"."0.3.4"."winapi"}" deps)
-    ]) else []);
-
-    buildDependencies = mapFeatures features ([
-      (crates."target_build_utils"."${deps."libloading"."0.3.4"."target_build_utils"}" deps)
-    ]);
-  };
-  features_.libloading."0.3.4" = deps: f: updateFeatures f ({
-    kernel32_sys."${deps.libloading."0.3.4".kernel32_sys}".default = true;
-    lazy_static."${deps.libloading."0.3.4".lazy_static}".default = true;
-    libloading."0.3.4".default = (f.libloading."0.3.4".default or true);
-    target_build_utils."${deps.libloading."0.3.4".target_build_utils}".default = true;
-    winapi."${deps.libloading."0.3.4".winapi}".default = true;
-  }) [
-    (features_.lazy_static."${deps."libloading"."0.3.4"."lazy_static"}" deps)
-    (features_.target_build_utils."${deps."libloading"."0.3.4"."target_build_utils"}" deps)
-    (features_.kernel32_sys."${deps."libloading"."0.3.4"."kernel32_sys"}" deps)
-    (features_.winapi."${deps."libloading"."0.3.4"."winapi"}" deps)
-  ];
-
-
-# end
-# libloading-0.5.0
-
-  crates.libloading."0.5.0" = deps: { features?(features_.libloading."0.5.0" deps {}) }: buildRustCrate {
-    crateName = "libloading";
-    version = "0.5.0";
-    description = "A safer binding to platform’s dynamic library loading utilities";
-    authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
-    sha256 = "11vzjaka1y979aril4ggwp33p35yz2isvx9m5w88r5sdcmq6iscn";
-    build = "build.rs";
-    dependencies = (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."libloading"."0.5.0"."winapi"}" deps)
-    ]) else []);
-
-    buildDependencies = mapFeatures features ([
-      (crates."cc"."${deps."libloading"."0.5.0"."cc"}" deps)
-    ]);
-  };
-  features_.libloading."0.5.0" = deps: f: updateFeatures f ({
-    cc."${deps.libloading."0.5.0".cc}".default = true;
-    libloading."0.5.0".default = (f.libloading."0.5.0".default or true);
-    winapi = fold recursiveUpdate {} [
-      { "${deps.libloading."0.5.0".winapi}"."errhandlingapi" = true; }
-      { "${deps.libloading."0.5.0".winapi}"."libloaderapi" = true; }
-      { "${deps.libloading."0.5.0".winapi}"."winerror" = true; }
-      { "${deps.libloading."0.5.0".winapi}".default = true; }
-    ];
-  }) [
-    (features_.cc."${deps."libloading"."0.5.0"."cc"}" deps)
-    (features_.winapi."${deps."libloading"."0.5.0"."winapi"}" deps)
-  ];
-
-
-# end
-# log-0.3.9
-
-  crates.log."0.3.9" = deps: { features?(features_.log."0.3.9" deps {}) }: buildRustCrate {
-    crateName = "log";
-    version = "0.3.9";
-    description = "A lightweight logging facade for Rust\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
-    dependencies = mapFeatures features ([
-      (crates."log"."${deps."log"."0.3.9"."log"}" deps)
-    ]);
-    features = mkFeatures (features."log"."0.3.9" or {});
-  };
-  features_.log."0.3.9" = deps: f: updateFeatures f (rec {
-    log = fold recursiveUpdate {} [
-      { "${deps.log."0.3.9".log}"."max_level_debug" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_debug" or false) ||
-        (log."0.3.9"."max_level_debug" or false) ||
-        (f."log"."0.3.9"."max_level_debug" or false); }
-      { "${deps.log."0.3.9".log}"."max_level_error" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_error" or false) ||
-        (log."0.3.9"."max_level_error" or false) ||
-        (f."log"."0.3.9"."max_level_error" or false); }
-      { "${deps.log."0.3.9".log}"."max_level_info" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_info" or false) ||
-        (log."0.3.9"."max_level_info" or false) ||
-        (f."log"."0.3.9"."max_level_info" or false); }
-      { "${deps.log."0.3.9".log}"."max_level_off" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_off" or false) ||
-        (log."0.3.9"."max_level_off" or false) ||
-        (f."log"."0.3.9"."max_level_off" or false); }
-      { "${deps.log."0.3.9".log}"."max_level_trace" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_trace" or false) ||
-        (log."0.3.9"."max_level_trace" or false) ||
-        (f."log"."0.3.9"."max_level_trace" or false); }
-      { "${deps.log."0.3.9".log}"."max_level_warn" =
-        (f.log."${deps.log."0.3.9".log}"."max_level_warn" or false) ||
-        (log."0.3.9"."max_level_warn" or false) ||
-        (f."log"."0.3.9"."max_level_warn" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_debug" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_debug" or false) ||
-        (log."0.3.9"."release_max_level_debug" or false) ||
-        (f."log"."0.3.9"."release_max_level_debug" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_error" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_error" or false) ||
-        (log."0.3.9"."release_max_level_error" or false) ||
-        (f."log"."0.3.9"."release_max_level_error" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_info" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_info" or false) ||
-        (log."0.3.9"."release_max_level_info" or false) ||
-        (f."log"."0.3.9"."release_max_level_info" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_off" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_off" or false) ||
-        (log."0.3.9"."release_max_level_off" or false) ||
-        (f."log"."0.3.9"."release_max_level_off" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_trace" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_trace" or false) ||
-        (log."0.3.9"."release_max_level_trace" or false) ||
-        (f."log"."0.3.9"."release_max_level_trace" or false); }
-      { "${deps.log."0.3.9".log}"."release_max_level_warn" =
-        (f.log."${deps.log."0.3.9".log}"."release_max_level_warn" or false) ||
-        (log."0.3.9"."release_max_level_warn" or false) ||
-        (f."log"."0.3.9"."release_max_level_warn" or false); }
-      { "${deps.log."0.3.9".log}"."std" =
-        (f.log."${deps.log."0.3.9".log}"."std" or false) ||
-        (log."0.3.9"."use_std" or false) ||
-        (f."log"."0.3.9"."use_std" or false); }
-      { "${deps.log."0.3.9".log}".default = true; }
-      { "0.3.9"."use_std" =
-        (f.log."0.3.9"."use_std" or false) ||
-        (f.log."0.3.9".default or false) ||
-        (log."0.3.9"."default" or false); }
-      { "0.3.9".default = (f.log."0.3.9".default or true); }
-    ];
-  }) [
-    (features_.log."${deps."log"."0.3.9"."log"}" deps)
-  ];
-
-
-# end
-# log-0.4.6
-
-  crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate {
-    crateName = "log";
-    version = "0.4.6";
-    description = "A lightweight logging facade for Rust\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr";
-    dependencies = mapFeatures features ([
-      (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps)
-    ]);
-    features = mkFeatures (features."log"."0.4.6" or {});
-  };
-  features_.log."0.4.6" = deps: f: updateFeatures f ({
-    cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
-    log."0.4.6".default = (f.log."0.4.6".default or true);
-  }) [
-    (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps)
-  ];
-
-
-# end
-# memchr-0.1.11
-
-  crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate {
-    crateName = "memchr";
-    version = "0.1.11";
-    description = "Safe interface to memchr.";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
-    ]);
-  };
-  features_.memchr."0.1.11" = deps: f: updateFeatures f ({
-    libc."${deps.memchr."0.1.11".libc}".default = true;
-    memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
-  }) [
-    (features_.libc."${deps."memchr"."0.1.11"."libc"}" deps)
-  ];
-
-
-# end
-# nix-0.6.0
-
-  crates.nix."0.6.0" = deps: { features?(features_.nix."0.6.0" deps {}) }: buildRustCrate {
-    crateName = "nix";
-    version = "0.6.0";
-    description = "Rust friendly bindings to *nix APIs";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."nix"."0.6.0"."bitflags"}" deps)
-      (crates."cfg_if"."${deps."nix"."0.6.0"."cfg_if"}" deps)
-      (crates."libc"."${deps."nix"."0.6.0"."libc"}" deps)
-      (crates."void"."${deps."nix"."0.6.0"."void"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."rustc_version"."${deps."nix"."0.6.0"."rustc_version"}" deps)
-      (crates."semver"."${deps."nix"."0.6.0"."semver"}" deps)
-    ]);
-    features = mkFeatures (features."nix"."0.6.0" or {});
-  };
-  features_.nix."0.6.0" = deps: f: updateFeatures f ({
-    bitflags."${deps.nix."0.6.0".bitflags}".default = true;
-    cfg_if."${deps.nix."0.6.0".cfg_if}".default = true;
-    libc."${deps.nix."0.6.0".libc}".default = true;
-    nix."0.6.0".default = (f.nix."0.6.0".default or true);
-    rustc_version."${deps.nix."0.6.0".rustc_version}".default = true;
-    semver."${deps.nix."0.6.0".semver}".default = true;
-    void."${deps.nix."0.6.0".void}".default = true;
-  }) [
-    (features_.bitflags."${deps."nix"."0.6.0"."bitflags"}" deps)
-    (features_.cfg_if."${deps."nix"."0.6.0"."cfg_if"}" deps)
-    (features_.libc."${deps."nix"."0.6.0"."libc"}" deps)
-    (features_.void."${deps."nix"."0.6.0"."void"}" deps)
-    (features_.rustc_version."${deps."nix"."0.6.0"."rustc_version"}" deps)
-    (features_.semver."${deps."nix"."0.6.0"."semver"}" deps)
-  ];
-
-
-# end
-# nix-0.9.0
-
-  crates.nix."0.9.0" = deps: { features?(features_.nix."0.9.0" deps {}) }: buildRustCrate {
-    crateName = "nix";
-    version = "0.9.0";
-    description = "Rust friendly bindings to *nix APIs";
-    authors = [ "The nix-rust Project Developers" ];
-    sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."nix"."0.9.0"."bitflags"}" deps)
-      (crates."cfg_if"."${deps."nix"."0.9.0"."cfg_if"}" deps)
-      (crates."libc"."${deps."nix"."0.9.0"."libc"}" deps)
-      (crates."void"."${deps."nix"."0.9.0"."void"}" deps)
-    ]);
-  };
-  features_.nix."0.9.0" = deps: f: updateFeatures f ({
-    bitflags."${deps.nix."0.9.0".bitflags}".default = true;
-    cfg_if."${deps.nix."0.9.0".cfg_if}".default = true;
-    libc."${deps.nix."0.9.0".libc}".default = true;
-    nix."0.9.0".default = (f.nix."0.9.0".default or true);
-    void."${deps.nix."0.9.0".void}".default = true;
-  }) [
-    (features_.bitflags."${deps."nix"."0.9.0"."bitflags"}" deps)
-    (features_.cfg_if."${deps."nix"."0.9.0"."cfg_if"}" deps)
-    (features_.libc."${deps."nix"."0.9.0"."libc"}" deps)
-    (features_.void."${deps."nix"."0.9.0"."void"}" deps)
-  ];
-
-
-# end
-# num-traits-0.1.43
-
-  crates.num_traits."0.1.43" = deps: { features?(features_.num_traits."0.1.43" deps {}) }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.1.43";
-    description = "Numeric traits for generic mathematics";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1zdzx78vrcg3f39w94pqjs1mwxl1phyv7843hwgwkzggwcxhhf6s";
-    dependencies = mapFeatures features ([
-      (crates."num_traits"."${deps."num_traits"."0.1.43"."num_traits"}" deps)
-    ]);
-  };
-  features_.num_traits."0.1.43" = deps: f: updateFeatures f ({
-    num_traits = fold recursiveUpdate {} [
-      { "${deps.num_traits."0.1.43".num_traits}".default = true; }
-      { "0.1.43".default = (f.num_traits."0.1.43".default or true); }
-    ];
-  }) [
-    (features_.num_traits."${deps."num_traits"."0.1.43"."num_traits"}" deps)
-  ];
-
-
-# end
-# num-traits-0.2.6
-
-  crates.num_traits."0.2.6" = deps: { features?(features_.num_traits."0.2.6" deps {}) }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.2.6";
-    description = "Numeric traits for generic mathematics";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1d20sil9n0wgznd1nycm3yjfj1mzyl41ambb7by1apxlyiil1azk";
-    build = "build.rs";
-    features = mkFeatures (features."num_traits"."0.2.6" or {});
-  };
-  features_.num_traits."0.2.6" = deps: f: updateFeatures f (rec {
-    num_traits = fold recursiveUpdate {} [
-      { "0.2.6"."std" =
-        (f.num_traits."0.2.6"."std" or false) ||
-        (f.num_traits."0.2.6".default or false) ||
-        (num_traits."0.2.6"."default" or false); }
-      { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
-    ];
-  }) [];
-
-
-# end
-# ordermap-0.3.5
-
-  crates.ordermap."0.3.5" = deps: { features?(features_.ordermap."0.3.5" deps {}) }: buildRustCrate {
-    crateName = "ordermap";
-    version = "0.3.5";
-    description = "A hash table with consistent order and fast iteration.";
-    authors = [ "bluss" ];
-    sha256 = "0b6vxfyh627yqm6war3392g1hhi4dbn49ibx2qv6mv490jdhv7d3";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."ordermap"."0.3.5" or {});
-  };
-  features_.ordermap."0.3.5" = deps: f: updateFeatures f (rec {
-    ordermap = fold recursiveUpdate {} [
-      { "0.3.5"."serde" =
-        (f.ordermap."0.3.5"."serde" or false) ||
-        (f.ordermap."0.3.5".serde-1 or false) ||
-        (ordermap."0.3.5"."serde-1" or false); }
-      { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
-    ];
-  }) [];
-
-
-# end
-# petgraph-0.4.13
-
-  crates.petgraph."0.4.13" = deps: { features?(features_.petgraph."0.4.13" deps {}) }: buildRustCrate {
-    crateName = "petgraph";
-    version = "0.4.13";
-    description = "Graph data structure library. Provides graph types and graph algorithms.";
-    authors = [ "bluss" "mitchmindtree" ];
-    sha256 = "0a8k12b9vd0bndwqhafa853w186axdw05bv4kqjimyaz67428g1i";
-    dependencies = mapFeatures features ([
-      (crates."fixedbitset"."${deps."petgraph"."0.4.13"."fixedbitset"}" deps)
-    ]
-      ++ (if features.petgraph."0.4.13".ordermap or false then [ (crates.ordermap."${deps."petgraph"."0.4.13".ordermap}" deps) ] else []));
-    features = mkFeatures (features."petgraph"."0.4.13" or {});
-  };
-  features_.petgraph."0.4.13" = deps: f: updateFeatures f (rec {
-    fixedbitset."${deps.petgraph."0.4.13".fixedbitset}".default = true;
-    ordermap."${deps.petgraph."0.4.13".ordermap}".default = true;
-    petgraph = fold recursiveUpdate {} [
-      { "0.4.13"."generate" =
-        (f.petgraph."0.4.13"."generate" or false) ||
-        (f.petgraph."0.4.13".unstable or false) ||
-        (petgraph."0.4.13"."unstable" or false); }
-      { "0.4.13"."graphmap" =
-        (f.petgraph."0.4.13"."graphmap" or false) ||
-        (f.petgraph."0.4.13".all or false) ||
-        (petgraph."0.4.13"."all" or false) ||
-        (f.petgraph."0.4.13".default or false) ||
-        (petgraph."0.4.13"."default" or false); }
-      { "0.4.13"."ordermap" =
-        (f.petgraph."0.4.13"."ordermap" or false) ||
-        (f.petgraph."0.4.13".graphmap or false) ||
-        (petgraph."0.4.13"."graphmap" or false); }
-      { "0.4.13"."quickcheck" =
-        (f.petgraph."0.4.13"."quickcheck" or false) ||
-        (f.petgraph."0.4.13".all or false) ||
-        (petgraph."0.4.13"."all" or false); }
-      { "0.4.13"."serde" =
-        (f.petgraph."0.4.13"."serde" or false) ||
-        (f.petgraph."0.4.13".serde-1 or false) ||
-        (petgraph."0.4.13"."serde-1" or false); }
-      { "0.4.13"."serde_derive" =
-        (f.petgraph."0.4.13"."serde_derive" or false) ||
-        (f.petgraph."0.4.13".serde-1 or false) ||
-        (petgraph."0.4.13"."serde-1" or false); }
-      { "0.4.13"."stable_graph" =
-        (f.petgraph."0.4.13"."stable_graph" or false) ||
-        (f.petgraph."0.4.13".all or false) ||
-        (petgraph."0.4.13"."all" or false) ||
-        (f.petgraph."0.4.13".default or false) ||
-        (petgraph."0.4.13"."default" or false); }
-      { "0.4.13"."unstable" =
-        (f.petgraph."0.4.13"."unstable" or false) ||
-        (f.petgraph."0.4.13".all or false) ||
-        (petgraph."0.4.13"."all" or false); }
-      { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
-    ];
-  }) [
-    (features_.fixedbitset."${deps."petgraph"."0.4.13"."fixedbitset"}" deps)
-    (features_.ordermap."${deps."petgraph"."0.4.13"."ordermap"}" deps)
-  ];
-
-
-# end
-# phf-0.7.23
-
-  crates.phf."0.7.23" = deps: { features?(features_.phf."0.7.23" deps {}) }: buildRustCrate {
-    crateName = "phf";
-    version = "0.7.23";
-    description = "Runtime support for perfect hash function data structures";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0annmaf9mmm12g2cdwpip32p674pmsf6xpiwa27mz3glmz73y8aq";
-    libPath = "src/lib.rs";
-    dependencies = mapFeatures features ([
-      (crates."phf_shared"."${deps."phf"."0.7.23"."phf_shared"}" deps)
-    ]);
-    features = mkFeatures (features."phf"."0.7.23" or {});
-  };
-  features_.phf."0.7.23" = deps: f: updateFeatures f (rec {
-    phf."0.7.23".default = (f.phf."0.7.23".default or true);
-    phf_shared = fold recursiveUpdate {} [
-      { "${deps.phf."0.7.23".phf_shared}"."core" =
-        (f.phf_shared."${deps.phf."0.7.23".phf_shared}"."core" or false) ||
-        (phf."0.7.23"."core" or false) ||
-        (f."phf"."0.7.23"."core" or false); }
-      { "${deps.phf."0.7.23".phf_shared}"."unicase" =
-        (f.phf_shared."${deps.phf."0.7.23".phf_shared}"."unicase" or false) ||
-        (phf."0.7.23"."unicase" or false) ||
-        (f."phf"."0.7.23"."unicase" or false); }
-      { "${deps.phf."0.7.23".phf_shared}".default = true; }
-    ];
-  }) [
-    (features_.phf_shared."${deps."phf"."0.7.23"."phf_shared"}" deps)
-  ];
-
-
-# end
-# phf_codegen-0.7.23
-
-  crates.phf_codegen."0.7.23" = deps: { features?(features_.phf_codegen."0.7.23" deps {}) }: buildRustCrate {
-    crateName = "phf_codegen";
-    version = "0.7.23";
-    description = "Codegen library for PHF types";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0k5ly0qykw56fxd19iy236wzghqdxq9zxnzcg8nm22cfzw4a35n0";
-    dependencies = mapFeatures features ([
-      (crates."phf_generator"."${deps."phf_codegen"."0.7.23"."phf_generator"}" deps)
-      (crates."phf_shared"."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps)
-    ]);
-  };
-  features_.phf_codegen."0.7.23" = deps: f: updateFeatures f ({
-    phf_codegen."0.7.23".default = (f.phf_codegen."0.7.23".default or true);
-    phf_generator."${deps.phf_codegen."0.7.23".phf_generator}".default = true;
-    phf_shared."${deps.phf_codegen."0.7.23".phf_shared}".default = true;
-  }) [
-    (features_.phf_generator."${deps."phf_codegen"."0.7.23"."phf_generator"}" deps)
-    (features_.phf_shared."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps)
-  ];
-
-
-# end
-# phf_generator-0.7.23
-
-  crates.phf_generator."0.7.23" = deps: { features?(features_.phf_generator."0.7.23" deps {}) }: buildRustCrate {
-    crateName = "phf_generator";
-    version = "0.7.23";
-    description = "PHF generation logic";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "106cd0bx3jf7mf2gaa8nx62c1las1w95c5gwsd4yqm5lj2rj4mza";
-    dependencies = mapFeatures features ([
-      (crates."phf_shared"."${deps."phf_generator"."0.7.23"."phf_shared"}" deps)
-      (crates."rand"."${deps."phf_generator"."0.7.23"."rand"}" deps)
-    ]);
-  };
-  features_.phf_generator."0.7.23" = deps: f: updateFeatures f ({
-    phf_generator."0.7.23".default = (f.phf_generator."0.7.23".default or true);
-    phf_shared."${deps.phf_generator."0.7.23".phf_shared}".default = true;
-    rand."${deps.phf_generator."0.7.23".rand}".default = true;
-  }) [
-    (features_.phf_shared."${deps."phf_generator"."0.7.23"."phf_shared"}" deps)
-    (features_.rand."${deps."phf_generator"."0.7.23"."rand"}" deps)
-  ];
-
-
-# end
-# phf_shared-0.7.23
-
-  crates.phf_shared."0.7.23" = deps: { features?(features_.phf_shared."0.7.23" deps {}) }: buildRustCrate {
-    crateName = "phf_shared";
-    version = "0.7.23";
-    description = "Support code shared by PHF libraries";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "04gzsq9vg9j8cr39hpkddxb0yqjdknvcpnylw112rqamy7ml4fy1";
-    libPath = "src/lib.rs";
-    dependencies = mapFeatures features ([
-      (crates."siphasher"."${deps."phf_shared"."0.7.23"."siphasher"}" deps)
-    ]);
-    features = mkFeatures (features."phf_shared"."0.7.23" or {});
-  };
-  features_.phf_shared."0.7.23" = deps: f: updateFeatures f ({
-    phf_shared."0.7.23".default = (f.phf_shared."0.7.23".default or true);
-    siphasher."${deps.phf_shared."0.7.23".siphasher}".default = true;
-  }) [
-    (features_.siphasher."${deps."phf_shared"."0.7.23"."siphasher"}" deps)
-  ];
-
-
-# end
-# pkg-config-0.3.14
-
-  crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.14";
-    description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
-  };
-  features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({
-    pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
-  }) [];
-
-
-# end
-# rand-0.3.22
-
-  crates.rand."0.3.22" = deps: { features?(features_.rand."0.3.22" deps {}) }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.22";
-    description = "Random number generators and other randomness functionality.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."rand"."0.3.22"."libc"}" deps)
-      (crates."rand"."${deps."rand"."0.3.22"."rand"}" deps)
-    ])
-      ++ (if kernel == "fuchsia" then mapFeatures features ([
-      (crates."fuchsia_zircon"."${deps."rand"."0.3.22"."fuchsia_zircon"}" deps)
-    ]) else []);
-    features = mkFeatures (features."rand"."0.3.22" or {});
-  };
-  features_.rand."0.3.22" = deps: f: updateFeatures f (rec {
-    fuchsia_zircon."${deps.rand."0.3.22".fuchsia_zircon}".default = true;
-    libc."${deps.rand."0.3.22".libc}".default = true;
-    rand = fold recursiveUpdate {} [
-      { "${deps.rand."0.3.22".rand}".default = true; }
-      { "0.3.22"."i128_support" =
-        (f.rand."0.3.22"."i128_support" or false) ||
-        (f.rand."0.3.22".nightly or false) ||
-        (rand."0.3.22"."nightly" or false); }
-      { "0.3.22".default = (f.rand."0.3.22".default or true); }
-    ];
-  }) [
-    (features_.libc."${deps."rand"."0.3.22"."libc"}" deps)
-    (features_.rand."${deps."rand"."0.3.22"."rand"}" deps)
-    (features_.fuchsia_zircon."${deps."rand"."0.3.22"."fuchsia_zircon"}" deps)
-  ];
-
-
-# end
-# rand-0.4.3
-
-  crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
-    crateName = "rand";
-    version = "0.4.3";
-    description = "Random number generators and other randomness functionality.\n";
-    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."${deps."rand"."0.4.3".libc}" deps) ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
-    ]) else []);
-    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"."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); }
-      { "0.4.3".default = (f.rand."0.4.3".default or true); }
-    ];
-    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)
-  ];
-
-
-# end
-# rand-0.5.5
-
-  crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate {
-    crateName = "rand";
-    version = "0.5.5";
-    description = "Random number generators and other randomness functionality.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9";
-    dependencies = mapFeatures features ([
-      (crates."rand_core"."${deps."rand"."0.5.5"."rand_core"}" deps)
-    ])
-      ++ (if kernel == "cloudabi" then mapFeatures features ([
-    ]
-      ++ (if features.rand."0.5.5".cloudabi or false then [ (crates.cloudabi."${deps."rand"."0.5.5".cloudabi}" deps) ] else [])) else [])
-      ++ (if kernel == "fuchsia" then mapFeatures features ([
-    ]
-      ++ (if features.rand."0.5.5".fuchsia-zircon or false then [ (crates.fuchsia_zircon."${deps."rand"."0.5.5".fuchsia_zircon}" deps) ] else [])) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
-    ]
-      ++ (if features.rand."0.5.5".libc or false then [ (crates.libc."${deps."rand"."0.5.5".libc}" deps) ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([
-    ]
-      ++ (if features.rand."0.5.5".winapi or false then [ (crates.winapi."${deps."rand"."0.5.5".winapi}" deps) ] else [])) else [])
-      ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([
-]) else []);
-    features = mkFeatures (features."rand"."0.5.5" or {});
-  };
-  features_.rand."0.5.5" = deps: f: updateFeatures f (rec {
-    cloudabi."${deps.rand."0.5.5".cloudabi}".default = true;
-    fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true;
-    libc."${deps.rand."0.5.5".libc}".default = true;
-    rand = fold recursiveUpdate {} [
-      { "0.5.5"."alloc" =
-        (f.rand."0.5.5"."alloc" or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5"."cloudabi" =
-        (f.rand."0.5.5"."cloudabi" or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5"."fuchsia-zircon" =
-        (f.rand."0.5.5"."fuchsia-zircon" or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5"."i128_support" =
-        (f.rand."0.5.5"."i128_support" or false) ||
-        (f.rand."0.5.5".nightly or false) ||
-        (rand."0.5.5"."nightly" or false); }
-      { "0.5.5"."libc" =
-        (f.rand."0.5.5"."libc" or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5"."serde" =
-        (f.rand."0.5.5"."serde" or false) ||
-        (f.rand."0.5.5".serde1 or false) ||
-        (rand."0.5.5"."serde1" or false); }
-      { "0.5.5"."serde_derive" =
-        (f.rand."0.5.5"."serde_derive" or false) ||
-        (f.rand."0.5.5".serde1 or false) ||
-        (rand."0.5.5"."serde1" or false); }
-      { "0.5.5"."std" =
-        (f.rand."0.5.5"."std" or false) ||
-        (f.rand."0.5.5".default or false) ||
-        (rand."0.5.5"."default" or false); }
-      { "0.5.5"."winapi" =
-        (f.rand."0.5.5"."winapi" or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5".default = (f.rand."0.5.5".default or true); }
-    ];
-    rand_core = fold recursiveUpdate {} [
-      { "${deps.rand."0.5.5".rand_core}"."alloc" =
-        (f.rand_core."${deps.rand."0.5.5".rand_core}"."alloc" or false) ||
-        (rand."0.5.5"."alloc" or false) ||
-        (f."rand"."0.5.5"."alloc" or false); }
-      { "${deps.rand."0.5.5".rand_core}"."serde1" =
-        (f.rand_core."${deps.rand."0.5.5".rand_core}"."serde1" or false) ||
-        (rand."0.5.5"."serde1" or false) ||
-        (f."rand"."0.5.5"."serde1" or false); }
-      { "${deps.rand."0.5.5".rand_core}"."std" =
-        (f.rand_core."${deps.rand."0.5.5".rand_core}"."std" or false) ||
-        (rand."0.5.5"."std" or false) ||
-        (f."rand"."0.5.5"."std" or false); }
-      { "${deps.rand."0.5.5".rand_core}".default = (f.rand_core."${deps.rand."0.5.5".rand_core}".default or false); }
-    ];
-    winapi = fold recursiveUpdate {} [
-      { "${deps.rand."0.5.5".winapi}"."minwindef" = true; }
-      { "${deps.rand."0.5.5".winapi}"."ntsecapi" = true; }
-      { "${deps.rand."0.5.5".winapi}"."profileapi" = true; }
-      { "${deps.rand."0.5.5".winapi}"."winnt" = true; }
-      { "${deps.rand."0.5.5".winapi}".default = true; }
-    ];
-  }) [
-    (features_.rand_core."${deps."rand"."0.5.5"."rand_core"}" deps)
-    (features_.cloudabi."${deps."rand"."0.5.5"."cloudabi"}" deps)
-    (features_.fuchsia_zircon."${deps."rand"."0.5.5"."fuchsia_zircon"}" deps)
-    (features_.libc."${deps."rand"."0.5.5"."libc"}" deps)
-    (features_.winapi."${deps."rand"."0.5.5"."winapi"}" deps)
-  ];
-
-
-# end
-# rand_core-0.2.2
-
-  crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate {
-    crateName = "rand_core";
-    version = "0.2.2";
-    description = "Core random number generator traits and tools for implementation.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc";
-    dependencies = mapFeatures features ([
-      (crates."rand_core"."${deps."rand_core"."0.2.2"."rand_core"}" deps)
-    ]);
-    features = mkFeatures (features."rand_core"."0.2.2" or {});
-  };
-  features_.rand_core."0.2.2" = deps: f: updateFeatures f (rec {
-    rand_core = fold recursiveUpdate {} [
-      { "${deps.rand_core."0.2.2".rand_core}"."alloc" =
-        (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."alloc" or false) ||
-        (rand_core."0.2.2"."alloc" or false) ||
-        (f."rand_core"."0.2.2"."alloc" or false); }
-      { "${deps.rand_core."0.2.2".rand_core}"."serde1" =
-        (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."serde1" or false) ||
-        (rand_core."0.2.2"."serde1" or false) ||
-        (f."rand_core"."0.2.2"."serde1" or false); }
-      { "${deps.rand_core."0.2.2".rand_core}"."std" =
-        (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."std" or false) ||
-        (rand_core."0.2.2"."std" or false) ||
-        (f."rand_core"."0.2.2"."std" or false); }
-      { "${deps.rand_core."0.2.2".rand_core}".default = (f.rand_core."${deps.rand_core."0.2.2".rand_core}".default or false); }
-      { "0.2.2".default = (f.rand_core."0.2.2".default or true); }
-    ];
-  }) [
-    (features_.rand_core."${deps."rand_core"."0.2.2"."rand_core"}" deps)
-  ];
-
-
-# end
-# rand_core-0.3.0
-
-  crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate {
-    crateName = "rand_core";
-    version = "0.3.0";
-    description = "Core random number generator traits and tools for implementation.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."rand_core"."0.3.0" or {});
-  };
-  features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec {
-    rand_core = fold recursiveUpdate {} [
-      { "0.3.0"."alloc" =
-        (f.rand_core."0.3.0"."alloc" or false) ||
-        (f.rand_core."0.3.0".std or false) ||
-        (rand_core."0.3.0"."std" or false); }
-      { "0.3.0"."serde" =
-        (f.rand_core."0.3.0"."serde" or false) ||
-        (f.rand_core."0.3.0".serde1 or false) ||
-        (rand_core."0.3.0"."serde1" or false); }
-      { "0.3.0"."serde_derive" =
-        (f.rand_core."0.3.0"."serde_derive" or false) ||
-        (f.rand_core."0.3.0".serde1 or false) ||
-        (rand_core."0.3.0"."serde1" or false); }
-      { "0.3.0"."std" =
-        (f.rand_core."0.3.0"."std" or false) ||
-        (f.rand_core."0.3.0".default or false) ||
-        (rand_core."0.3.0"."default" or false); }
-      { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
-    ];
-  }) [];
-
-
-# end
-# regex-0.1.80
-
-  crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate {
-    crateName = "regex";
-    version = "0.1.80";
-    description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
-    dependencies = mapFeatures features ([
-      (crates."aho_corasick"."${deps."regex"."0.1.80"."aho_corasick"}" deps)
-      (crates."memchr"."${deps."regex"."0.1.80"."memchr"}" deps)
-      (crates."regex_syntax"."${deps."regex"."0.1.80"."regex_syntax"}" deps)
-      (crates."thread_local"."${deps."regex"."0.1.80"."thread_local"}" deps)
-      (crates."utf8_ranges"."${deps."regex"."0.1.80"."utf8_ranges"}" deps)
-    ]);
-    features = mkFeatures (features."regex"."0.1.80" or {});
-  };
-  features_.regex."0.1.80" = deps: f: updateFeatures f (rec {
-    aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true;
-    memchr."${deps.regex."0.1.80".memchr}".default = true;
-    regex = fold recursiveUpdate {} [
-      { "0.1.80"."simd" =
-        (f.regex."0.1.80"."simd" or false) ||
-        (f.regex."0.1.80".simd-accel or false) ||
-        (regex."0.1.80"."simd-accel" or false); }
-      { "0.1.80".default = (f.regex."0.1.80".default or true); }
-    ];
-    regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true;
-    thread_local."${deps.regex."0.1.80".thread_local}".default = true;
-    utf8_ranges."${deps.regex."0.1.80".utf8_ranges}".default = true;
-  }) [
-    (features_.aho_corasick."${deps."regex"."0.1.80"."aho_corasick"}" deps)
-    (features_.memchr."${deps."regex"."0.1.80"."memchr"}" deps)
-    (features_.regex_syntax."${deps."regex"."0.1.80"."regex_syntax"}" deps)
-    (features_.thread_local."${deps."regex"."0.1.80"."thread_local"}" deps)
-    (features_.utf8_ranges."${deps."regex"."0.1.80"."utf8_ranges"}" deps)
-  ];
-
-
-# end
-# regex-syntax-0.3.9
-
-  crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate {
-    crateName = "regex-syntax";
-    version = "0.3.9";
-    description = "A regular expression parser.";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
-  };
-  features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
-    regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
-  }) [];
-
-
-# end
-# rlua-0.9.7
-
-  crates.rlua."0.9.7" = deps: { features?(features_.rlua."0.9.7" deps {}) }: buildRustCrate {
-    crateName = "rlua";
-    version = "0.9.7";
-    description = "High level bindings to Lua 5.3";
-    authors = [ "kyren <catherine@chucklefish.org>" ];
-    sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."rlua"."0.9.7"."libc"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-    ]
-      ++ (if features.rlua."0.9.7".gcc or false then [ (crates.gcc."${deps."rlua"."0.9.7".gcc}" deps) ] else []));
-    features = mkFeatures (features."rlua"."0.9.7" or {});
-  };
-  features_.rlua."0.9.7" = deps: f: updateFeatures f (rec {
-    gcc."${deps.rlua."0.9.7".gcc}".default = true;
-    libc."${deps.rlua."0.9.7".libc}".default = true;
-    rlua = fold recursiveUpdate {} [
-      { "0.9.7"."builtin-lua" =
-        (f.rlua."0.9.7"."builtin-lua" or false) ||
-        (f.rlua."0.9.7".default or false) ||
-        (rlua."0.9.7"."default" or false); }
-      { "0.9.7"."gcc" =
-        (f.rlua."0.9.7"."gcc" or false) ||
-        (f.rlua."0.9.7".builtin-lua or false) ||
-        (rlua."0.9.7"."builtin-lua" or false); }
-      { "0.9.7".default = (f.rlua."0.9.7".default or true); }
-    ];
-  }) [
-    (features_.libc."${deps."rlua"."0.9.7"."libc"}" deps)
-    (features_.gcc."${deps."rlua"."0.9.7"."gcc"}" deps)
-  ];
-
-
-# end
-# rustc-serialize-0.3.24
-
-  crates.rustc_serialize."0.3.24" = deps: { features?(features_.rustc_serialize."0.3.24" deps {}) }: buildRustCrate {
-    crateName = "rustc-serialize";
-    version = "0.3.24";
-    description = "Generic serialization/deserialization support corresponding to the\n`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes\nsupport for hex, base64, and json encoding and decoding.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
-  };
-  features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f ({
-    rustc_serialize."0.3.24".default = (f.rustc_serialize."0.3.24".default or true);
-  }) [];
-
-
-# end
-# rustc_version-0.1.7
-
-  crates.rustc_version."0.1.7" = deps: { features?(features_.rustc_version."0.1.7" deps {}) }: buildRustCrate {
-    crateName = "rustc_version";
-    version = "0.1.7";
-    description = "A library for querying the version of a installed rustc compiler";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
-    dependencies = mapFeatures features ([
-      (crates."semver"."${deps."rustc_version"."0.1.7"."semver"}" deps)
-    ]);
-  };
-  features_.rustc_version."0.1.7" = deps: f: updateFeatures f ({
-    rustc_version."0.1.7".default = (f.rustc_version."0.1.7".default or true);
-    semver."${deps.rustc_version."0.1.7".semver}".default = true;
-  }) [
-    (features_.semver."${deps."rustc_version"."0.1.7"."semver"}" deps)
-  ];
-
-
-# end
-# rustwlc-0.7.0
-
-  crates.rustwlc."0.7.0" = deps: { features?(features_.rustwlc."0.7.0" deps {}) }: buildRustCrate {
-    crateName = "rustwlc";
-    version = "0.7.0";
-    description = "wlc Wayland library bindings for Rust";
-    authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
-    sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."rustwlc"."0.7.0"."bitflags"}" deps)
-      (crates."libc"."${deps."rustwlc"."0.7.0"."libc"}" deps)
-    ]
-      ++ (if features.rustwlc."0.7.0".wayland-sys or false then [ (crates.wayland_sys."${deps."rustwlc"."0.7.0".wayland_sys}" deps) ] else []));
-    features = mkFeatures (features."rustwlc"."0.7.0" or {});
-  };
-  features_.rustwlc."0.7.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.rustwlc."0.7.0".bitflags}".default = true;
-    libc."${deps.rustwlc."0.7.0".libc}".default = true;
-    rustwlc = fold recursiveUpdate {} [
-      { "0.7.0"."wayland-sys" =
-        (f.rustwlc."0.7.0"."wayland-sys" or false) ||
-        (f.rustwlc."0.7.0".wlc-wayland or false) ||
-        (rustwlc."0.7.0"."wlc-wayland" or false); }
-      { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
-    ];
-    wayland_sys = fold recursiveUpdate {} [
-      { "${deps.rustwlc."0.7.0".wayland_sys}"."server" = true; }
-      { "${deps.rustwlc."0.7.0".wayland_sys}".default = true; }
-    ];
-  }) [
-    (features_.bitflags."${deps."rustwlc"."0.7.0"."bitflags"}" deps)
-    (features_.libc."${deps."rustwlc"."0.7.0"."libc"}" deps)
-    (features_.wayland_sys."${deps."rustwlc"."0.7.0"."wayland_sys"}" deps)
-  ];
-
-
-# end
-# semver-0.1.20
-
-  crates.semver."0.1.20" = deps: { features?(features_.semver."0.1.20" deps {}) }: buildRustCrate {
-    crateName = "semver";
-    version = "0.1.20";
-    description = "Semantic version parsing and comparison.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
-  };
-  features_.semver."0.1.20" = deps: f: updateFeatures f ({
-    semver."0.1.20".default = (f.semver."0.1.20".default or true);
-  }) [];
-
-
-# end
-# serde-0.9.15
-
-  crates.serde."0.9.15" = deps: { features?(features_.serde."0.9.15" deps {}) }: buildRustCrate {
-    crateName = "serde";
-    version = "0.9.15";
-    description = "A generic serialization/deserialization framework";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."serde"."0.9.15" or {});
-  };
-  features_.serde."0.9.15" = deps: f: updateFeatures f (rec {
-    serde = fold recursiveUpdate {} [
-      { "0.9.15"."alloc" =
-        (f.serde."0.9.15"."alloc" or false) ||
-        (f.serde."0.9.15".collections or false) ||
-        (serde."0.9.15"."collections" or false); }
-      { "0.9.15"."serde_derive" =
-        (f.serde."0.9.15"."serde_derive" or false) ||
-        (f.serde."0.9.15".derive or false) ||
-        (serde."0.9.15"."derive" or false) ||
-        (f.serde."0.9.15".playground or false) ||
-        (serde."0.9.15"."playground" or false); }
-      { "0.9.15"."std" =
-        (f.serde."0.9.15"."std" or false) ||
-        (f.serde."0.9.15".default or false) ||
-        (serde."0.9.15"."default" or false) ||
-        (f.serde."0.9.15".unstable-testing or false) ||
-        (serde."0.9.15"."unstable-testing" or false); }
-      { "0.9.15"."unstable" =
-        (f.serde."0.9.15"."unstable" or false) ||
-        (f.serde."0.9.15".alloc or false) ||
-        (serde."0.9.15"."alloc" or false) ||
-        (f.serde."0.9.15".unstable-testing or false) ||
-        (serde."0.9.15"."unstable-testing" or false); }
-      { "0.9.15".default = (f.serde."0.9.15".default or true); }
-    ];
-  }) [];
-
-
-# end
-# serde_json-0.9.10
-
-  crates.serde_json."0.9.10" = deps: { features?(features_.serde_json."0.9.10" deps {}) }: buildRustCrate {
-    crateName = "serde_json";
-    version = "0.9.10";
-    description = "A JSON serialization file format";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
-    dependencies = mapFeatures features ([
-      (crates."dtoa"."${deps."serde_json"."0.9.10"."dtoa"}" deps)
-      (crates."itoa"."${deps."serde_json"."0.9.10"."itoa"}" deps)
-      (crates."num_traits"."${deps."serde_json"."0.9.10"."num_traits"}" deps)
-      (crates."serde"."${deps."serde_json"."0.9.10"."serde"}" deps)
-    ]);
-    features = mkFeatures (features."serde_json"."0.9.10" or {});
-  };
-  features_.serde_json."0.9.10" = deps: f: updateFeatures f (rec {
-    dtoa."${deps.serde_json."0.9.10".dtoa}".default = true;
-    itoa."${deps.serde_json."0.9.10".itoa}".default = true;
-    num_traits."${deps.serde_json."0.9.10".num_traits}".default = true;
-    serde."${deps.serde_json."0.9.10".serde}".default = true;
-    serde_json = fold recursiveUpdate {} [
-      { "0.9.10"."linked-hash-map" =
-        (f.serde_json."0.9.10"."linked-hash-map" or false) ||
-        (f.serde_json."0.9.10".preserve_order or false) ||
-        (serde_json."0.9.10"."preserve_order" or false); }
-      { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
-    ];
-  }) [
-    (features_.dtoa."${deps."serde_json"."0.9.10"."dtoa"}" deps)
-    (features_.itoa."${deps."serde_json"."0.9.10"."itoa"}" deps)
-    (features_.num_traits."${deps."serde_json"."0.9.10"."num_traits"}" deps)
-    (features_.serde."${deps."serde_json"."0.9.10"."serde"}" deps)
-  ];
-
-
-# end
-# siphasher-0.2.3
-
-  crates.siphasher."0.2.3" = deps: { features?(features_.siphasher."0.2.3" deps {}) }: buildRustCrate {
-    crateName = "siphasher";
-    version = "0.2.3";
-    description = "SipHash functions from rust-core < 1.13";
-    authors = [ "Frank Denis <github@pureftpd.org>" ];
-    sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
-  };
-  features_.siphasher."0.2.3" = deps: f: updateFeatures f ({
-    siphasher."0.2.3".default = (f.siphasher."0.2.3".default or true);
-  }) [];
-
-
-# end
-# target_build_utils-0.3.1
-
-  crates.target_build_utils."0.3.1" = deps: { features?(features_.target_build_utils."0.3.1" deps {}) }: buildRustCrate {
-    crateName = "target_build_utils";
-    version = "0.3.1";
-    description = "DEPRECATED: Use Cargo environment variables `CARGO_CFG_TARGET_*`";
-    authors = [ "Simonas Kazlauskas <target_build_utils@kazlauskas.me>" ];
-    sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."phf"."${deps."target_build_utils"."0.3.1"."phf"}" deps)
-    ]
-      ++ (if features.target_build_utils."0.3.1".serde_json or false then [ (crates.serde_json."${deps."target_build_utils"."0.3.1".serde_json}" deps) ] else []));
-
-    buildDependencies = mapFeatures features ([
-      (crates."phf_codegen"."${deps."target_build_utils"."0.3.1"."phf_codegen"}" deps)
-    ]);
-    features = mkFeatures (features."target_build_utils"."0.3.1" or {});
-  };
-  features_.target_build_utils."0.3.1" = deps: f: updateFeatures f (rec {
-    phf."${deps.target_build_utils."0.3.1".phf}".default = true;
-    phf_codegen."${deps.target_build_utils."0.3.1".phf_codegen}".default = true;
-    serde_json."${deps.target_build_utils."0.3.1".serde_json}".default = true;
-    target_build_utils = fold recursiveUpdate {} [
-      { "0.3.1"."serde_json" =
-        (f.target_build_utils."0.3.1"."serde_json" or false) ||
-        (f.target_build_utils."0.3.1".default or false) ||
-        (target_build_utils."0.3.1"."default" or false); }
-      { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
-    ];
-  }) [
-    (features_.phf."${deps."target_build_utils"."0.3.1"."phf"}" deps)
-    (features_.serde_json."${deps."target_build_utils"."0.3.1"."serde_json"}" deps)
-    (features_.phf_codegen."${deps."target_build_utils"."0.3.1"."phf_codegen"}" deps)
-  ];
-
-
-# end
-# thread-id-2.0.0
-
-  crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate {
-    crateName = "thread-id";
-    version = "2.0.0";
-    description = "Get a unique thread ID";
-    authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ];
-    sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
-    dependencies = mapFeatures features ([
-      (crates."kernel32_sys"."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps)
-      (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
-    ]);
-  };
-  features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
-    kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
-    libc."${deps.thread_id."2.0.0".libc}".default = true;
-    thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
-  }) [
-    (features_.kernel32_sys."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps)
-    (features_.libc."${deps."thread_id"."2.0.0"."libc"}" deps)
-  ];
-
-
-# end
-# thread_local-0.2.7
-
-  crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate {
-    crateName = "thread_local";
-    version = "0.2.7";
-    description = "Per-object thread-local storage";
-    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
-    dependencies = mapFeatures features ([
-      (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
-    ]);
-  };
-  features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
-    thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
-    thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
-  }) [
-    (features_.thread_id."${deps."thread_local"."0.2.7"."thread_id"}" deps)
-  ];
-
-
-# end
-# token_store-0.1.2
-
-  crates.token_store."0.1.2" = deps: { features?(features_.token_store."0.1.2" deps {}) }: buildRustCrate {
-    crateName = "token_store";
-    version = "0.1.2";
-    description = "A token-based store for arbitrary values";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
-  };
-  features_.token_store."0.1.2" = deps: f: updateFeatures f ({
-    token_store."0.1.2".default = (f.token_store."0.1.2".default or true);
-  }) [];
-
-
-# end
-# unicode-width-0.1.5
-
-  crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
-    crateName = "unicode-width";
-    version = "0.1.5";
-    description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n";
-    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 ({
-    unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
-  }) [];
-
-
-# end
-# utf8-ranges-0.1.3
-
-  crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate {
-    crateName = "utf8-ranges";
-    version = "0.1.3";
-    description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges.";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
-  };
-  features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
-    utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
-  }) [];
-
-
-# end
-# uuid-0.3.1
-
-  crates.uuid."0.3.1" = deps: { features?(features_.uuid."0.3.1" deps {}) }: buildRustCrate {
-    crateName = "uuid";
-    version = "0.3.1";
-    description = "A library to generate and parse UUIDs.\n";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
-    dependencies = mapFeatures features ([
-    ]
-      ++ (if features.uuid."0.3.1".rand or false then [ (crates.rand."${deps."uuid"."0.3.1".rand}" deps) ] else [])
-      ++ (if features.uuid."0.3.1".rustc-serialize or false then [ (crates.rustc_serialize."${deps."uuid"."0.3.1".rustc_serialize}" deps) ] else []));
-    features = mkFeatures (features."uuid"."0.3.1" or {});
-  };
-  features_.uuid."0.3.1" = deps: f: updateFeatures f (rec {
-    rand."${deps.uuid."0.3.1".rand}".default = true;
-    rustc_serialize."${deps.uuid."0.3.1".rustc_serialize}".default = true;
-    uuid = fold recursiveUpdate {} [
-      { "0.3.1"."rand" =
-        (f.uuid."0.3.1"."rand" or false) ||
-        (f.uuid."0.3.1".v4 or false) ||
-        (uuid."0.3.1"."v4" or false); }
-      { "0.3.1"."sha1" =
-        (f.uuid."0.3.1"."sha1" or false) ||
-        (f.uuid."0.3.1".v5 or false) ||
-        (uuid."0.3.1"."v5" or false); }
-      { "0.3.1".default = (f.uuid."0.3.1".default or true); }
-    ];
-  }) [
-    (features_.rand."${deps."uuid"."0.3.1"."rand"}" deps)
-    (features_.rustc_serialize."${deps."uuid"."0.3.1"."rustc_serialize"}" deps)
-  ];
-
-
-# end
-# void-1.0.2
-
-  crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate {
-    crateName = "void";
-    version = "1.0.2";
-    description = "The uninhabited void type for use in statically impossible cases.";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
-    features = mkFeatures (features."void"."1.0.2" or {});
-  };
-  features_.void."1.0.2" = deps: f: updateFeatures f (rec {
-    void = fold recursiveUpdate {} [
-      { "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); }
-      { "1.0.2".default = (f.void."1.0.2".default or true); }
-    ];
-  }) [];
-
-
-# end
-# way-cooler-0.8.1
-
-  crates.way_cooler."0.8.1" = deps: { features?(features_.way_cooler."0.8.1" deps {}) }: buildRustCrate {
-    crateName = "way-cooler";
-    version = "0.8.1";
-    description = "Customizeable Wayland compositor written in Rust";
-    authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
-    sha256 = "01cp5z0qf522d7cvsr9gfp7f4hkphmp38hv70dsf9lvcnp6p1qkc";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."way_cooler"."0.8.1"."bitflags"}" deps)
-      (crates."cairo_rs"."${deps."way_cooler"."0.8.1"."cairo_rs"}" deps)
-      (crates."cairo_sys_rs"."${deps."way_cooler"."0.8.1"."cairo_sys_rs"}" deps)
-      (crates."dbus"."${deps."way_cooler"."0.8.1"."dbus"}" deps)
-      (crates."dbus_macros"."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
-      (crates."env_logger"."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-      (crates."gdk_pixbuf"."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
-      (crates."getopts"."${deps."way_cooler"."0.8.1"."getopts"}" deps)
-      (crates."glib"."${deps."way_cooler"."0.8.1"."glib"}" deps)
-      (crates."json_macro"."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
-      (crates."lazy_static"."${deps."way_cooler"."0.8.1"."lazy_static"}" deps)
-      (crates."log"."${deps."way_cooler"."0.8.1"."log"}" deps)
-      (crates."nix"."${deps."way_cooler"."0.8.1"."nix"}" deps)
-      (crates."petgraph"."${deps."way_cooler"."0.8.1"."petgraph"}" deps)
-      (crates."rlua"."${deps."way_cooler"."0.8.1"."rlua"}" deps)
-      (crates."rustc_serialize"."${deps."way_cooler"."0.8.1"."rustc_serialize"}" deps)
-      (crates."rustwlc"."${deps."way_cooler"."0.8.1"."rustwlc"}" deps)
-      (crates."uuid"."${deps."way_cooler"."0.8.1"."uuid"}" deps)
-      (crates."wayland_server"."${deps."way_cooler"."0.8.1"."wayland_server"}" deps)
-      (crates."wayland_sys"."${deps."way_cooler"."0.8.1"."wayland_sys"}" deps)
-      (crates."xcb"."${deps."way_cooler"."0.8.1"."xcb"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."wayland_scanner"."${deps."way_cooler"."0.8.1"."wayland_scanner"}" deps)
-    ]);
-    features = mkFeatures (features."way_cooler"."0.8.1" or {});
-  };
-  features_.way_cooler."0.8.1" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.way_cooler."0.8.1".bitflags}".default = true;
-    cairo_rs."${deps.way_cooler."0.8.1".cairo_rs}".default = true;
-    cairo_sys_rs."${deps.way_cooler."0.8.1".cairo_sys_rs}".default = true;
-    dbus."${deps.way_cooler."0.8.1".dbus}".default = true;
-    dbus_macros."${deps.way_cooler."0.8.1".dbus_macros}".default = true;
-    env_logger."${deps.way_cooler."0.8.1".env_logger}".default = true;
-    gdk_pixbuf."${deps.way_cooler."0.8.1".gdk_pixbuf}".default = true;
-    getopts."${deps.way_cooler."0.8.1".getopts}".default = true;
-    glib."${deps.way_cooler."0.8.1".glib}".default = true;
-    json_macro."${deps.way_cooler."0.8.1".json_macro}".default = true;
-    lazy_static."${deps.way_cooler."0.8.1".lazy_static}".default = true;
-    log."${deps.way_cooler."0.8.1".log}".default = true;
-    nix."${deps.way_cooler."0.8.1".nix}".default = true;
-    petgraph."${deps.way_cooler."0.8.1".petgraph}".default = true;
-    rlua = fold recursiveUpdate {} [
-      { "${deps.way_cooler."0.8.1".rlua}"."builtin-lua" =
-        (f.rlua."${deps.way_cooler."0.8.1".rlua}"."builtin-lua" or false) ||
-        (way_cooler."0.8.1"."builtin-lua" or false) ||
-        (f."way_cooler"."0.8.1"."builtin-lua" or false); }
-      { "${deps.way_cooler."0.8.1".rlua}".default = (f.rlua."${deps.way_cooler."0.8.1".rlua}".default or false); }
-    ];
-    rustc_serialize."${deps.way_cooler."0.8.1".rustc_serialize}".default = true;
-    rustwlc = fold recursiveUpdate {} [
-      { "${deps.way_cooler."0.8.1".rustwlc}"."static-wlc" =
-        (f.rustwlc."${deps.way_cooler."0.8.1".rustwlc}"."static-wlc" or false) ||
-        (way_cooler."0.8.1"."static-wlc" or false) ||
-        (f."way_cooler"."0.8.1"."static-wlc" or false); }
-      { "${deps.way_cooler."0.8.1".rustwlc}"."wlc-wayland" = true; }
-      { "${deps.way_cooler."0.8.1".rustwlc}".default = true; }
-    ];
-    uuid = fold recursiveUpdate {} [
-      { "${deps.way_cooler."0.8.1".uuid}"."rustc-serialize" = true; }
-      { "${deps.way_cooler."0.8.1".uuid}"."v4" = true; }
-      { "${deps.way_cooler."0.8.1".uuid}".default = true; }
-    ];
-    way_cooler."0.8.1".default = (f.way_cooler."0.8.1".default or true);
-    wayland_scanner."${deps.way_cooler."0.8.1".wayland_scanner}".default = true;
-    wayland_server."${deps.way_cooler."0.8.1".wayland_server}".default = true;
-    wayland_sys = fold recursiveUpdate {} [
-      { "${deps.way_cooler."0.8.1".wayland_sys}"."client" = true; }
-      { "${deps.way_cooler."0.8.1".wayland_sys}"."dlopen" = true; }
-      { "${deps.way_cooler."0.8.1".wayland_sys}".default = true; }
-    ];
-    xcb = fold recursiveUpdate {} [
-      { "${deps.way_cooler."0.8.1".xcb}"."xkb" = true; }
-      { "${deps.way_cooler."0.8.1".xcb}".default = true; }
-    ];
-  }) [
-    (features_.bitflags."${deps."way_cooler"."0.8.1"."bitflags"}" deps)
-    (features_.cairo_rs."${deps."way_cooler"."0.8.1"."cairo_rs"}" deps)
-    (features_.cairo_sys_rs."${deps."way_cooler"."0.8.1"."cairo_sys_rs"}" deps)
-    (features_.dbus."${deps."way_cooler"."0.8.1"."dbus"}" deps)
-    (features_.dbus_macros."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
-    (features_.env_logger."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-    (features_.gdk_pixbuf."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
-    (features_.getopts."${deps."way_cooler"."0.8.1"."getopts"}" deps)
-    (features_.glib."${deps."way_cooler"."0.8.1"."glib"}" deps)
-    (features_.json_macro."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
-    (features_.lazy_static."${deps."way_cooler"."0.8.1"."lazy_static"}" deps)
-    (features_.log."${deps."way_cooler"."0.8.1"."log"}" deps)
-    (features_.nix."${deps."way_cooler"."0.8.1"."nix"}" deps)
-    (features_.petgraph."${deps."way_cooler"."0.8.1"."petgraph"}" deps)
-    (features_.rlua."${deps."way_cooler"."0.8.1"."rlua"}" deps)
-    (features_.rustc_serialize."${deps."way_cooler"."0.8.1"."rustc_serialize"}" deps)
-    (features_.rustwlc."${deps."way_cooler"."0.8.1"."rustwlc"}" deps)
-    (features_.uuid."${deps."way_cooler"."0.8.1"."uuid"}" deps)
-    (features_.wayland_server."${deps."way_cooler"."0.8.1"."wayland_server"}" deps)
-    (features_.wayland_sys."${deps."way_cooler"."0.8.1"."wayland_sys"}" deps)
-    (features_.xcb."${deps."way_cooler"."0.8.1"."xcb"}" deps)
-    (features_.wayland_scanner."${deps."way_cooler"."0.8.1"."wayland_scanner"}" deps)
-  ];
-
-
-# end
-# wayland-scanner-0.12.5
-
-  crates.wayland_scanner."0.12.5" = deps: { features?(features_.wayland_scanner."0.12.5" deps {}) }: buildRustCrate {
-    crateName = "wayland-scanner";
-    version = "0.12.5";
-    description = "Wayland Scanner for generating rust APIs from XML wayland protocol files. Intented for use with wayland-sys. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1s0fsc3pff0fxvzqsy8n018smwacih9ix8ww0yf969aa0vak15dz";
-    dependencies = mapFeatures features ([
-      (crates."xml_rs"."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps)
-    ]);
-  };
-  features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f ({
-    wayland_scanner."0.12.5".default = (f.wayland_scanner."0.12.5".default or true);
-    xml_rs."${deps.wayland_scanner."0.12.5".xml_rs}".default = true;
-  }) [
-    (features_.xml_rs."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps)
-  ];
-
-
-# end
-# wayland-server-0.12.5
-
-  crates.wayland_server."0.12.5" = deps: { features?(features_.wayland_server."0.12.5" deps {}) }: buildRustCrate {
-    crateName = "wayland-server";
-    version = "0.12.5";
-    description = "Bindings to the standard C implementation of the wayland protocol, server side.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "17g0m9afcmi24ylirw4l8i70s5849x7m4b5nxk9k13s5pkza68ag";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."wayland_server"."0.12.5"."bitflags"}" deps)
-      (crates."libc"."${deps."wayland_server"."0.12.5"."libc"}" deps)
-      (crates."nix"."${deps."wayland_server"."0.12.5"."nix"}" deps)
-      (crates."token_store"."${deps."wayland_server"."0.12.5"."token_store"}" deps)
-      (crates."wayland_sys"."${deps."wayland_server"."0.12.5"."wayland_sys"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."wayland_scanner"."${deps."wayland_server"."0.12.5"."wayland_scanner"}" deps)
-    ]);
-    features = mkFeatures (features."wayland_server"."0.12.5" or {});
-  };
-  features_.wayland_server."0.12.5" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.wayland_server."0.12.5".bitflags}".default = true;
-    libc."${deps.wayland_server."0.12.5".libc}".default = true;
-    nix."${deps.wayland_server."0.12.5".nix}".default = true;
-    token_store."${deps.wayland_server."0.12.5".token_store}".default = true;
-    wayland_scanner."${deps.wayland_server."0.12.5".wayland_scanner}".default = true;
-    wayland_server."0.12.5".default = (f.wayland_server."0.12.5".default or true);
-    wayland_sys = fold recursiveUpdate {} [
-      { "${deps.wayland_server."0.12.5".wayland_sys}"."dlopen" =
-        (f.wayland_sys."${deps.wayland_server."0.12.5".wayland_sys}"."dlopen" or false) ||
-        (wayland_server."0.12.5"."dlopen" or false) ||
-        (f."wayland_server"."0.12.5"."dlopen" or false); }
-      { "${deps.wayland_server."0.12.5".wayland_sys}"."server" = true; }
-      { "${deps.wayland_server."0.12.5".wayland_sys}".default = true; }
-    ];
-  }) [
-    (features_.bitflags."${deps."wayland_server"."0.12.5"."bitflags"}" deps)
-    (features_.libc."${deps."wayland_server"."0.12.5"."libc"}" deps)
-    (features_.nix."${deps."wayland_server"."0.12.5"."nix"}" deps)
-    (features_.token_store."${deps."wayland_server"."0.12.5"."token_store"}" deps)
-    (features_.wayland_sys."${deps."wayland_server"."0.12.5"."wayland_sys"}" deps)
-    (features_.wayland_scanner."${deps."wayland_server"."0.12.5"."wayland_scanner"}" deps)
-  ];
-
-
-# end
-# wayland-sys-0.6.0
-
-  crates.wayland_sys."0.6.0" = deps: { features?(features_.wayland_sys."0.6.0" deps {}) }: buildRustCrate {
-    crateName = "wayland-sys";
-    version = "0.6.0";
-    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
-    dependencies = mapFeatures features ([
-      (crates."dlib"."${deps."wayland_sys"."0.6.0"."dlib"}" deps)
-    ]
-      ++ (if features.wayland_sys."0.6.0".libc or false then [ (crates.libc."${deps."wayland_sys"."0.6.0".libc}" deps) ] else []));
-    features = mkFeatures (features."wayland_sys"."0.6.0" or {});
-  };
-  features_.wayland_sys."0.6.0" = deps: f: updateFeatures f (rec {
-    dlib = fold recursiveUpdate {} [
-      { "${deps.wayland_sys."0.6.0".dlib}"."dlopen" =
-        (f.dlib."${deps.wayland_sys."0.6.0".dlib}"."dlopen" or false) ||
-        (wayland_sys."0.6.0"."dlopen" or false) ||
-        (f."wayland_sys"."0.6.0"."dlopen" or false); }
-      { "${deps.wayland_sys."0.6.0".dlib}".default = true; }
-    ];
-    libc."${deps.wayland_sys."0.6.0".libc}".default = true;
-    wayland_sys = fold recursiveUpdate {} [
-      { "0.6.0"."lazy_static" =
-        (f.wayland_sys."0.6.0"."lazy_static" or false) ||
-        (f.wayland_sys."0.6.0".dlopen or false) ||
-        (wayland_sys."0.6.0"."dlopen" or false); }
-      { "0.6.0"."libc" =
-        (f.wayland_sys."0.6.0"."libc" or false) ||
-        (f.wayland_sys."0.6.0".server or false) ||
-        (wayland_sys."0.6.0"."server" or false); }
-      { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
-    ];
-  }) [
-    (features_.dlib."${deps."wayland_sys"."0.6.0"."dlib"}" deps)
-    (features_.libc."${deps."wayland_sys"."0.6.0"."libc"}" deps)
-  ];
-
-
-# end
-# wayland-sys-0.9.10
-
-  crates.wayland_sys."0.9.10" = deps: { features?(features_.wayland_sys."0.9.10" deps {}) }: buildRustCrate {
-    crateName = "wayland-sys";
-    version = "0.9.10";
-    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
-    dependencies = mapFeatures features ([
-      (crates."dlib"."${deps."wayland_sys"."0.9.10"."dlib"}" deps)
-    ]
-      ++ (if features.wayland_sys."0.9.10".lazy_static or false then [ (crates.lazy_static."${deps."wayland_sys"."0.9.10".lazy_static}" deps) ] else [])
-      ++ (if features.wayland_sys."0.9.10".libc or false then [ (crates.libc."${deps."wayland_sys"."0.9.10".libc}" deps) ] else []));
-    features = mkFeatures (features."wayland_sys"."0.9.10" or {});
-  };
-  features_.wayland_sys."0.9.10" = deps: f: updateFeatures f (rec {
-    dlib = fold recursiveUpdate {} [
-      { "${deps.wayland_sys."0.9.10".dlib}"."dlopen" =
-        (f.dlib."${deps.wayland_sys."0.9.10".dlib}"."dlopen" or false) ||
-        (wayland_sys."0.9.10"."dlopen" or false) ||
-        (f."wayland_sys"."0.9.10"."dlopen" or false); }
-      { "${deps.wayland_sys."0.9.10".dlib}".default = true; }
-    ];
-    lazy_static."${deps.wayland_sys."0.9.10".lazy_static}".default = true;
-    libc."${deps.wayland_sys."0.9.10".libc}".default = true;
-    wayland_sys = fold recursiveUpdate {} [
-      { "0.9.10"."lazy_static" =
-        (f.wayland_sys."0.9.10"."lazy_static" or false) ||
-        (f.wayland_sys."0.9.10".dlopen or false) ||
-        (wayland_sys."0.9.10"."dlopen" or false); }
-      { "0.9.10"."libc" =
-        (f.wayland_sys."0.9.10"."libc" or false) ||
-        (f.wayland_sys."0.9.10".server or false) ||
-        (wayland_sys."0.9.10"."server" or false); }
-      { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
-    ];
-  }) [
-    (features_.dlib."${deps."wayland_sys"."0.9.10"."dlib"}" deps)
-    (features_.lazy_static."${deps."wayland_sys"."0.9.10"."lazy_static"}" deps)
-    (features_.libc."${deps."wayland_sys"."0.9.10"."libc"}" deps)
-  ];
-
-
-# end
-# wayland-sys-0.12.5
-
-  crates.wayland_sys."0.12.5" = deps: { features?(features_.wayland_sys."0.12.5" deps {}) }: buildRustCrate {
-    crateName = "wayland-sys";
-    version = "0.12.5";
-    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "0mwk5vc7mibxka5w66vy2qj32b72d1srqvp36nr15xfl9lwf3dc4";
-    dependencies = mapFeatures features ([
-      (crates."dlib"."${deps."wayland_sys"."0.12.5"."dlib"}" deps)
-    ]
-      ++ (if features.wayland_sys."0.12.5".lazy_static or false then [ (crates.lazy_static."${deps."wayland_sys"."0.12.5".lazy_static}" deps) ] else [])
-      ++ (if features.wayland_sys."0.12.5".libc or false then [ (crates.libc."${deps."wayland_sys"."0.12.5".libc}" deps) ] else []));
-    features = mkFeatures (features."wayland_sys"."0.12.5" or {});
-  };
-  features_.wayland_sys."0.12.5" = deps: f: updateFeatures f (rec {
-    dlib = fold recursiveUpdate {} [
-      { "${deps.wayland_sys."0.12.5".dlib}"."dlopen" =
-        (f.dlib."${deps.wayland_sys."0.12.5".dlib}"."dlopen" or false) ||
-        (wayland_sys."0.12.5"."dlopen" or false) ||
-        (f."wayland_sys"."0.12.5"."dlopen" or false); }
-      { "${deps.wayland_sys."0.12.5".dlib}".default = true; }
-    ];
-    lazy_static."${deps.wayland_sys."0.12.5".lazy_static}".default = true;
-    libc."${deps.wayland_sys."0.12.5".libc}".default = true;
-    wayland_sys = fold recursiveUpdate {} [
-      { "0.12.5"."lazy_static" =
-        (f.wayland_sys."0.12.5"."lazy_static" or false) ||
-        (f.wayland_sys."0.12.5".dlopen or false) ||
-        (wayland_sys."0.12.5"."dlopen" or false); }
-      { "0.12.5"."libc" =
-        (f.wayland_sys."0.12.5"."libc" or false) ||
-        (f.wayland_sys."0.12.5".server or false) ||
-        (wayland_sys."0.12.5"."server" or false); }
-      { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
-    ];
-  }) [
-    (features_.dlib."${deps."wayland_sys"."0.12.5"."dlib"}" deps)
-    (features_.lazy_static."${deps."wayland_sys"."0.12.5"."lazy_static"}" deps)
-    (features_.libc."${deps."wayland_sys"."0.12.5"."libc"}" deps)
-  ];
-
-
-# end
-# winapi-0.2.8
-
-  crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings.";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-  };
-  features_.winapi."0.2.8" = deps: f: updateFeatures f ({
-    winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
-  }) [];
-
-
-# end
-# winapi-0.3.6
-
-  crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.3.6";
-    description = "Raw FFI bindings for all of Windows API.";
-    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 ({
-    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)
-  ];
-
-
-# end
-# winapi-build-0.1.1
-
-  crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    description = "Common code for build.rs in WinAPI -sys crates.";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-  };
-  features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
-    winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
-  }) [];
-
-
-# end
-# winapi-i686-pc-windows-gnu-0.4.0
-
-  crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "winapi-i686-pc-windows-gnu";
-    version = "0.4.0";
-    description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
-    build = "build.rs";
-  };
-  features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
-    winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
-  }) [];
-
-
-# end
-# winapi-x86_64-pc-windows-gnu-0.4.0
-
-  crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
-    crateName = "winapi-x86_64-pc-windows-gnu";
-    version = "0.4.0";
-    description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
-    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 ({
-    winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
-  }) [];
-
-
-# end
-# xcb-0.8.2
-
-  crates.xcb."0.8.2" = deps: { features?(features_.xcb."0.8.2" deps {}) }: buildRustCrate {
-    crateName = "xcb";
-    version = "0.8.2";
-    description = "Rust bindings and wrappers for XCB";
-    authors = [ "Remi Thebault <remi.thebault@gmail.com>" ];
-    sha256 = "06l8jms57wvz01vx82a3cwak9b9qwdkadvpmkk1zimy2qg7i7dkl";
-    build = "build.rs";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."xcb"."0.8.2"."libc"}" deps)
-      (crates."log"."${deps."xcb"."0.8.2"."log"}" deps)
-    ]);
-
-    buildDependencies = mapFeatures features ([
-      (crates."libc"."${deps."xcb"."0.8.2"."libc"}" deps)
-    ]);
-    features = mkFeatures (features."xcb"."0.8.2" or {});
-  };
-  features_.xcb."0.8.2" = deps: f: updateFeatures f (rec {
-    libc."${deps.xcb."0.8.2".libc}".default = true;
-    log."${deps.xcb."0.8.2".log}".default = true;
-    xcb = fold recursiveUpdate {} [
-      { "0.8.2"."composite" =
-        (f.xcb."0.8.2"."composite" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."damage" =
-        (f.xcb."0.8.2"."damage" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."dpms" =
-        (f.xcb."0.8.2"."dpms" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."dri2" =
-        (f.xcb."0.8.2"."dri2" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."dri3" =
-        (f.xcb."0.8.2"."dri3" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."glx" =
-        (f.xcb."0.8.2"."glx" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."randr" =
-        (f.xcb."0.8.2"."randr" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."record" =
-        (f.xcb."0.8.2"."record" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."render" =
-        (f.xcb."0.8.2"."render" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false) ||
-        (f.xcb."0.8.2".present or false) ||
-        (xcb."0.8.2"."present" or false) ||
-        (f.xcb."0.8.2".randr or false) ||
-        (xcb."0.8.2"."randr" or false) ||
-        (f.xcb."0.8.2".xfixes or false) ||
-        (xcb."0.8.2"."xfixes" or false); }
-      { "0.8.2"."res" =
-        (f.xcb."0.8.2"."res" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."screensaver" =
-        (f.xcb."0.8.2"."screensaver" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."shape" =
-        (f.xcb."0.8.2"."shape" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false) ||
-        (f.xcb."0.8.2".xfixes or false) ||
-        (xcb."0.8.2"."xfixes" or false); }
-      { "0.8.2"."shm" =
-        (f.xcb."0.8.2"."shm" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false) ||
-        (f.xcb."0.8.2".xv or false) ||
-        (xcb."0.8.2"."xv" or false); }
-      { "0.8.2"."sync" =
-        (f.xcb."0.8.2"."sync" or false) ||
-        (f.xcb."0.8.2".present or false) ||
-        (xcb."0.8.2"."present" or false); }
-      { "0.8.2"."thread" =
-        (f.xcb."0.8.2"."thread" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xevie" =
-        (f.xcb."0.8.2"."xevie" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xf86dri" =
-        (f.xcb."0.8.2"."xf86dri" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xfixes" =
-        (f.xcb."0.8.2"."xfixes" or false) ||
-        (f.xcb."0.8.2".composite or false) ||
-        (xcb."0.8.2"."composite" or false) ||
-        (f.xcb."0.8.2".damage or false) ||
-        (xcb."0.8.2"."damage" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false) ||
-        (f.xcb."0.8.2".present or false) ||
-        (xcb."0.8.2"."present" or false) ||
-        (f.xcb."0.8.2".xinput or false) ||
-        (xcb."0.8.2"."xinput" or false); }
-      { "0.8.2"."xinerama" =
-        (f.xcb."0.8.2"."xinerama" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xkb" =
-        (f.xcb."0.8.2"."xkb" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xlib_xcb" =
-        (f.xcb."0.8.2"."xlib_xcb" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xprint" =
-        (f.xcb."0.8.2"."xprint" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xselinux" =
-        (f.xcb."0.8.2"."xselinux" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xtest" =
-        (f.xcb."0.8.2"."xtest" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2"."xv" =
-        (f.xcb."0.8.2"."xv" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false) ||
-        (f.xcb."0.8.2".xvmc or false) ||
-        (xcb."0.8.2"."xvmc" or false); }
-      { "0.8.2"."xvmc" =
-        (f.xcb."0.8.2"."xvmc" or false) ||
-        (f.xcb."0.8.2".debug_all or false) ||
-        (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".default = (f.xcb."0.8.2".default or true); }
-    ];
-  }) [
-    (features_.libc."${deps."xcb"."0.8.2"."libc"}" deps)
-    (features_.log."${deps."xcb"."0.8.2"."log"}" deps)
-    (features_.libc."${deps."xcb"."0.8.2"."libc"}" deps)
-  ];
-
-
-# end
-# xml-rs-0.7.0
-
-  crates.xml_rs."0.7.0" = deps: { features?(features_.xml_rs."0.7.0" deps {}) }: buildRustCrate {
-    crateName = "xml-rs";
-    version = "0.7.0";
-    description = "An XML library in pure Rust";
-    authors = [ "Vladimir Matveev <vladimir.matweev@gmail.com>" ];
-    sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb";
-    libPath = "src/lib.rs";
-    libName = "xml";
-    crateBin =
-      [{  name = "xml-analyze";  path = "src/analyze.rs"; }];
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."xml_rs"."0.7.0"."bitflags"}" deps)
-    ]);
-  };
-  features_.xml_rs."0.7.0" = deps: f: updateFeatures f ({
-    bitflags."${deps.xml_rs."0.7.0".bitflags}".default = true;
-    xml_rs."0.7.0".default = (f.xml_rs."0.7.0".default or true);
-  }) [
-    (features_.bitflags."${deps."xml_rs"."0.7.0"."bitflags"}" deps)
-  ];
-
-
-# end
-}
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
deleted file mode 100644
index 7bc6ac700204..000000000000
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
-, wayland, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk-pixbuf
-}:
-
-let
-  wlc = callPackage ./wlc.nix {};
-
-  # refer to
-  # https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
-  # for version numbers
-  cratesIO = callPackage ./crates-io.nix {};
-
-  fakegit = writeShellScriptBin "git" ''
-    echo ""
-  '';
-  # https://nest.pijul.com/pmeunier/carnix/discussions/22
-  version = "0.8.1";
-  deps = (callPackage ./way-cooler.nix {}).deps;
-  way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps {
-    features = cratesIO.features_.way_cooler.${version} deps {
-      way_cooler.${version} = f;
-    };
-  };
-  way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
-    crateOverrides = defaultCrateOverrides // {
-
-    way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
-  };}).overrideAttrs (oldAttrs: {
-    postBuild = ''
-      mkdir -p $out/etc
-      cp -r config $out/etc/way-cooler
-    '';
-  });
-
-  wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: {
-    nativeBuildInputs = [ makeWrapper ];
-
-    postFixup = ''
-      makeWrapper $out/bin/wc-bg $out/bin/wc-bg \
-        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
-    '';
-  });
-
-  wc-grab = (callPackage ./wc-grab.nix {}).wc_grab {};
-
-  wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
-    crateOverrides = defaultCrateOverrides // {
-
-    wc-lock = attrs: { buildInputs = [ pam ]; };
-  };}).overrideAttrs (oldAttrs: {
-    nativeBuildInputs = [ makeWrapper ];
-
-    postFixup = ''
-      makeWrapper $out/bin/wc-lock $out/bin/wc-lock \
-        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
-    '';
-  });
-
-  # https://github.com/way-cooler/way-cooler/issues/446
-  wc-bar-bare = stdenv.mkDerivation {
-    name = "wc-bar-bare-2017-12-05";
-
-    src = fetchurl {
-      url = "https://github.com/way-cooler/way-cooler/files/1529701/bar.py.txt";
-      sha256 = "1n1rf1k02i6vimr9n0iksf65phhyy96i5wh5d0rrx7yqki3dh6ka";
-    };
-
-    unpackPhase = "cat $src > bar.py.txt";
-
-    # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-350567833
-    patches = [ ./bar.diff ];
-
-    pythonPath = with python3Packages; [ pydbus ];
-    nativeBuildInputs = with python3Packages; [ python wrapPython ];
-
-    installPhase = ''
-      install -Dm755 bar.py.txt $out/bin/bar.py
-      patchShebangs $out/bin/bar.py
-      wrapPythonPrograms
-    '';
-  };
-  wc-bar = writeShellScriptBin "lemonbar" ''
-    SELECTED="#000000"
-    SELECTED_OTHER_WORKSPACE="#555555"
-    BACKGROUND="#4E2878"
-    # https://github.com/way-cooler/way-cooler/issues/446#issuecomment-349471439
-    sleep 5
-    ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
-  '';
-in symlinkJoin {
-  inherit version;
-  name = "way-cooler-with-extensions-${version}";
-  paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
-
-  meta = with stdenv.lib; {
-    description = "Customizable Wayland compositor (window manager)";
-    longDescription = ''
-      Way Cooler is a customizable tiling window manager written in Rust
-      for Wayland and configurable using Lua. It is heavily inspired by
-      the tiling and extensibility of both i3 and awesome. While Lua is
-      used for the configuration, like awesome, extensions for Way Cooler
-      are implemented as totally separate client programs using D-Bus.
-      This means that you can use virtually any language to extend the
-      window manager, with much better guarantees about interoperability
-      between extensions.
-    '';
-    homepage = http://way-cooler.org/;
-    license = with licenses; [ mit ];
-    maintainers = [ maintainers.miltador ];
-    platforms = platforms.all;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
deleted file mode 100644
index 28a327f1c137..000000000000
--- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix
+++ /dev/null
@@ -1,314 +0,0 @@
-# Generated by carnix 0.9.2: 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 {
-  way_cooler = crates.crates.way_cooler."0.8.1" deps;
-  __all = [ (way_cooler {}) ];
-  deps.aho_corasick."0.5.3" = {
-    memchr = "0.1.11";
-  };
-  deps.bitflags."0.4.0" = {};
-  deps.bitflags."0.6.0" = {};
-  deps.bitflags."0.7.0" = {};
-  deps.bitflags."0.9.1" = {};
-  deps.bitflags."1.0.4" = {};
-  deps.c_vec."1.2.1" = {};
-  deps.cairo_rs."0.2.0" = {
-    c_vec = "1.2.1";
-    cairo_sys_rs = "0.4.0";
-    glib = "0.3.1";
-    glib_sys = "0.4.0";
-    libc = "0.2.44";
-    winapi = "0.2.8";
-  };
-  deps.cairo_sys_rs."0.4.0" = {
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-    winapi = "0.2.8";
-  };
-  deps.cc."1.0.25" = {};
-  deps.cfg_if."0.1.6" = {};
-  deps.cloudabi."0.0.3" = {
-    bitflags = "1.0.4";
-  };
-  deps.dbus."0.4.1" = {
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-  };
-  deps.dbus_macros."0.0.6" = {
-    dbus = "0.4.1";
-  };
-  deps.dlib."0.3.1" = {
-    libloading = "0.3.4";
-  };
-  deps.dlib."0.4.1" = {
-    libloading = "0.5.0";
-  };
-  deps.dtoa."0.4.3" = {};
-  deps.dummy_rustwlc."0.7.1" = {
-    bitflags = "0.6.0";
-    libc = "0.2.44";
-    wayland_sys = "0.9.10";
-  };
-  deps.env_logger."0.3.5" = {
-    log = "0.3.9";
-    regex = "0.1.80";
-  };
-  deps.fixedbitset."0.1.9" = {};
-  deps.fuchsia_zircon."0.3.3" = {
-    bitflags = "1.0.4";
-    fuchsia_zircon_sys = "0.3.3";
-  };
-  deps.fuchsia_zircon_sys."0.3.3" = {};
-  deps.gcc."0.3.55" = {};
-  deps.gdk_pixbuf."0.2.0" = {
-    gdk_pixbuf_sys = "0.4.0";
-    glib = "0.3.1";
-    glib_sys = "0.4.0";
-    gobject_sys = "0.4.0";
-    libc = "0.2.44";
-  };
-  deps.gdk_pixbuf_sys."0.4.0" = {
-    bitflags = "0.9.1";
-    gio_sys = "0.4.0";
-    glib_sys = "0.4.0";
-    gobject_sys = "0.4.0";
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-  };
-  deps.getopts."0.2.18" = {
-    unicode_width = "0.1.5";
-  };
-  deps.gio_sys."0.4.0" = {
-    bitflags = "0.9.1";
-    glib_sys = "0.4.0";
-    gobject_sys = "0.4.0";
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-  };
-  deps.glib."0.3.1" = {
-    bitflags = "0.9.1";
-    glib_sys = "0.4.0";
-    gobject_sys = "0.4.0";
-    lazy_static = "0.2.11";
-    libc = "0.2.44";
-  };
-  deps.glib_sys."0.4.0" = {
-    bitflags = "0.9.1";
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-  };
-  deps.gobject_sys."0.4.0" = {
-    bitflags = "0.9.1";
-    glib_sys = "0.4.0";
-    libc = "0.2.44";
-    pkg_config = "0.3.14";
-  };
-  deps.itoa."0.3.4" = {};
-  deps.json_macro."0.1.1" = {
-    rustc_serialize = "0.3.24";
-  };
-  deps.kernel32_sys."0.2.2" = {
-    winapi = "0.2.8";
-    winapi_build = "0.1.1";
-  };
-  deps.lazy_static."0.2.11" = {};
-  deps.lazy_static."1.2.0" = {};
-  deps.libc."0.2.44" = {};
-  deps.libloading."0.3.4" = {
-    lazy_static = "0.2.11";
-    target_build_utils = "0.3.1";
-    kernel32_sys = "0.2.2";
-    winapi = "0.2.8";
-  };
-  deps.libloading."0.5.0" = {
-    cc = "1.0.25";
-    winapi = "0.3.6";
-  };
-  deps.log."0.3.9" = {
-    log = "0.4.6";
-  };
-  deps.log."0.4.6" = {
-    cfg_if = "0.1.6";
-  };
-  deps.memchr."0.1.11" = {
-    libc = "0.2.44";
-  };
-  deps.nix."0.6.0" = {
-    bitflags = "0.4.0";
-    cfg_if = "0.1.6";
-    libc = "0.2.44";
-    void = "1.0.2";
-    rustc_version = "0.1.7";
-    semver = "0.1.20";
-  };
-  deps.nix."0.9.0" = {
-    bitflags = "0.9.1";
-    cfg_if = "0.1.6";
-    libc = "0.2.44";
-    void = "1.0.2";
-  };
-  deps.num_traits."0.1.43" = {
-    num_traits = "0.2.6";
-  };
-  deps.num_traits."0.2.6" = {};
-  deps.ordermap."0.3.5" = {};
-  deps.petgraph."0.4.13" = {
-    fixedbitset = "0.1.9";
-    ordermap = "0.3.5";
-  };
-  deps.phf."0.7.23" = {
-    phf_shared = "0.7.23";
-  };
-  deps.phf_codegen."0.7.23" = {
-    phf_generator = "0.7.23";
-    phf_shared = "0.7.23";
-  };
-  deps.phf_generator."0.7.23" = {
-    phf_shared = "0.7.23";
-    rand = "0.5.5";
-  };
-  deps.phf_shared."0.7.23" = {
-    siphasher = "0.2.3";
-  };
-  deps.pkg_config."0.3.14" = {};
-  deps.rand."0.3.22" = {
-    libc = "0.2.44";
-    rand = "0.4.3";
-    fuchsia_zircon = "0.3.3";
-  };
-  deps.rand."0.4.3" = {
-    fuchsia_zircon = "0.3.3";
-    libc = "0.2.44";
-    winapi = "0.3.6";
-  };
-  deps.rand."0.5.5" = {
-    rand_core = "0.2.2";
-    cloudabi = "0.0.3";
-    fuchsia_zircon = "0.3.3";
-    libc = "0.2.44";
-    winapi = "0.3.6";
-  };
-  deps.rand_core."0.2.2" = {
-    rand_core = "0.3.0";
-  };
-  deps.rand_core."0.3.0" = {};
-  deps.regex."0.1.80" = {
-    aho_corasick = "0.5.3";
-    memchr = "0.1.11";
-    regex_syntax = "0.3.9";
-    thread_local = "0.2.7";
-    utf8_ranges = "0.1.3";
-  };
-  deps.regex_syntax."0.3.9" = {};
-  deps.rlua."0.9.7" = {
-    libc = "0.2.44";
-    gcc = "0.3.55";
-  };
-  deps.rustc_serialize."0.3.24" = {};
-  deps.rustc_version."0.1.7" = {
-    semver = "0.1.20";
-  };
-  deps.rustwlc."0.7.0" = {
-    bitflags = "0.7.0";
-    libc = "0.2.44";
-    wayland_sys = "0.6.0";
-  };
-  deps.semver."0.1.20" = {};
-  deps.serde."0.9.15" = {};
-  deps.serde_json."0.9.10" = {
-    dtoa = "0.4.3";
-    itoa = "0.3.4";
-    num_traits = "0.1.43";
-    serde = "0.9.15";
-  };
-  deps.siphasher."0.2.3" = {};
-  deps.target_build_utils."0.3.1" = {
-    phf = "0.7.23";
-    serde_json = "0.9.10";
-    phf_codegen = "0.7.23";
-  };
-  deps.thread_id."2.0.0" = {
-    kernel32_sys = "0.2.2";
-    libc = "0.2.44";
-  };
-  deps.thread_local."0.2.7" = {
-    thread_id = "2.0.0";
-  };
-  deps.token_store."0.1.2" = {};
-  deps.unicode_width."0.1.5" = {};
-  deps.utf8_ranges."0.1.3" = {};
-  deps.uuid."0.3.1" = {
-    rand = "0.3.22";
-    rustc_serialize = "0.3.24";
-  };
-  deps.void."1.0.2" = {};
-  deps.way_cooler."0.8.1" = {
-    bitflags = "0.7.0";
-    cairo_rs = "0.2.0";
-    cairo_sys_rs = "0.4.0";
-    dbus = "0.4.1";
-    dbus_macros = "0.0.6";
-    env_logger = "0.3.5";
-    gdk_pixbuf = "0.2.0";
-    getopts = "0.2.18";
-    glib = "0.3.1";
-    json_macro = "0.1.1";
-    lazy_static = "0.2.11";
-    log = "0.3.9";
-    nix = "0.6.0";
-    petgraph = "0.4.13";
-    rlua = "0.9.7";
-    rustc_serialize = "0.3.24";
-    rustwlc = "0.7.0";
-    uuid = "0.3.1";
-    wayland_server = "0.12.5";
-    wayland_sys = "0.12.5";
-    xcb = "0.8.2";
-    wayland_scanner = "0.12.5";
-  };
-  deps.wayland_scanner."0.12.5" = {
-    xml_rs = "0.7.0";
-  };
-  deps.wayland_server."0.12.5" = {
-    bitflags = "1.0.4";
-    libc = "0.2.44";
-    nix = "0.9.0";
-    token_store = "0.1.2";
-    wayland_sys = "0.12.5";
-    wayland_scanner = "0.12.5";
-  };
-  deps.wayland_sys."0.6.0" = {
-    dlib = "0.3.1";
-    libc = "0.2.44";
-  };
-  deps.wayland_sys."0.9.10" = {
-    dlib = "0.3.1";
-    lazy_static = "0.2.11";
-    libc = "0.2.44";
-  };
-  deps.wayland_sys."0.12.5" = {
-    dlib = "0.4.1";
-    lazy_static = "1.2.0";
-    libc = "0.2.44";
-  };
-  deps.winapi."0.2.8" = {};
-  deps.winapi."0.3.6" = {
-    winapi_i686_pc_windows_gnu = "0.4.0";
-    winapi_x86_64_pc_windows_gnu = "0.4.0";
-  };
-  deps.winapi_build."0.1.1" = {};
-  deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
-  deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
-  deps.xcb."0.8.2" = {
-    libc = "0.2.44";
-    log = "0.4.6";
-  };
-  deps.xml_rs."0.7.0" = {
-    bitflags = "1.0.4";
-  };
-}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
deleted file mode 100644
index a797e7aacdef..000000000000
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ /dev/null
@@ -1,1372 +0,0 @@
-# Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.buildPlatform.parsed.kernel.name;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  wc_bg = f: wc_bg_0_3_0 { features = wc_bg_0_3_0_features { wc_bg_0_3_0 = f; }; };
-  ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.9.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ];
-    sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.3";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.7.0";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.9.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "0.5.3";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "1.1.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp";
-    inherit dependencies buildDependencies features;
-  };
-  cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1";
-    inherit dependencies buildDependencies features;
-  };
-  clap_2_26_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "clap";
-    version = "2.26.2";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
-    sha256 = "0njvc0b7m11yym25jrr8h47nb3k3lpzzafjf22y33c5p4rw7fn2d";
-    inherit dependencies buildDependencies features;
-  };
-  coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "coco";
-    version = "0.1.1";
-    authors = [ "Stjepan Glavina <stjepang@gmail.com>" ];
-    sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94";
-    inherit dependencies buildDependencies features;
-  };
-  color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "color_quant";
-    version = "1.0.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj";
-    inherit dependencies buildDependencies features;
-  };
-  dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dlib";
-    version = "0.3.1";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
-    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_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "either";
-    version = "1.2.0";
-    authors = [ "bluss" ];
-    sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp";
-    inherit dependencies buildDependencies features;
-  };
-  enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "enum_primitive";
-    version = "0.1.1";
-    authors = [ "Anders Kaseorg <andersk@mit.edu>" ];
-    sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y";
-    inherit dependencies buildDependencies features;
-  };
-  flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "flate2";
-    version = "0.2.20";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon";
-    version = "0.2.1";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon-sys";
-    version = "0.2.0";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w";
-    inherit dependencies buildDependencies features;
-  };
-  futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures";
-    version = "0.1.16";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b";
-    inherit dependencies buildDependencies features;
-  };
-  gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "gif";
-    version = "0.9.2";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa";
-    inherit dependencies buildDependencies features;
-  };
-  glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "glob";
-    version = "0.2.11";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
-    inherit dependencies buildDependencies features;
-  };
-  image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "image";
-    version = "0.10.4";
-    authors = [ "ccgn" "bvssvni <bvssvni@gmail.com>" "nwin" "TyOverby <ty@pre-alpha.com>" ];
-    sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw";
-    libPath = "./src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "inflate";
-    version = "0.1.1";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h";
-    inherit dependencies buildDependencies features;
-  };
-  itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.3.4";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
-    inherit dependencies buildDependencies features;
-  };
-  jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "jpeg-decoder";
-    version = "0.1.13";
-    authors = [ "Ulf Nilsson <kaksmet@gmail.com>" ];
-    sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "0.2.9";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.32";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1i8njlar6v9qvmkyfvwzhxrvkqw6ijp8fqdnya5csqixxz18a532";
-    inherit dependencies buildDependencies features;
-  };
-  libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libloading";
-    version = "0.3.4";
-    authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
-    sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lzw";
-    version = "0.10.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb";
-    inherit dependencies buildDependencies features;
-  };
-  miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "miniz-sys";
-    version = "0.1.10";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln";
-    libPath = "lib.rs";
-    libName = "miniz_sys";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-bigint";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788";
-    inherit dependencies buildDependencies features;
-  };
-  num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-integer";
-    version = "0.1.35";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc";
-    inherit dependencies buildDependencies features;
-  };
-  num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-iter";
-    version = "0.1.34";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9";
-    inherit dependencies buildDependencies features;
-  };
-  num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-rational";
-    version = "0.1.39";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
-    inherit dependencies buildDependencies features;
-  };
-  num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num_cpus";
-    version = "1.7.0";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f";
-    inherit dependencies buildDependencies features;
-  };
-  phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_codegen";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
-    inherit dependencies buildDependencies features;
-  };
-  phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_generator";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
-    inherit dependencies buildDependencies features;
-  };
-  phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_shared";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "png";
-    version = "0.5.2";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_3_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.17";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "06ra3pr36dlyq3kp5lbia8xnw5g0zsys2d69frr7y6df5hhb1r8j";
-    inherit dependencies buildDependencies features;
-  };
-  rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rayon";
-    version = "0.8.2";
-    authors = [ "Niko Matsakis <niko@alum.mit.edu>" "Josh Stone <cuviper@gmail.com>" ];
-    sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8";
-    inherit dependencies buildDependencies features;
-  };
-  rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rayon-core";
-    version = "1.2.1";
-    authors = [ "Niko Matsakis <niko@alum.mit.edu>" "Josh Stone <cuviper@gmail.com>" ];
-    sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_syscall";
-    version = "0.1.31";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4";
-    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;
-  };
-  rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc-serialize";
-    version = "0.3.24";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
-    inherit dependencies buildDependencies features;
-  };
-  scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scoped_threadpool";
-    version = "0.1.8";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6";
-    inherit dependencies buildDependencies features;
-  };
-  scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scopeguard";
-    version = "0.3.2";
-    authors = [ "bluss" ];
-    sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2";
-    inherit dependencies buildDependencies features;
-  };
-  serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "0.9.15";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
-    inherit dependencies buildDependencies features;
-  };
-  serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_json";
-    version = "0.9.10";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
-    inherit dependencies buildDependencies features;
-  };
-  siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "siphasher";
-    version = "0.2.2";
-    authors = [ "Frank Denis <github@pureftpd.org>" ];
-    sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.6.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
-    inherit dependencies buildDependencies features;
-  };
-  target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "target_build_utils";
-    version = "0.3.1";
-    authors = [ "Simonas Kazlauskas <target_build_utils@kazlauskas.me>" ];
-    sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  tempfile_2_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tempfile";
-    version = "2.2.0";
-    authors = [ "Steven Allen <steven@stebalien.com>" ];
-    sha256 = "1z3l901ipvi0s0mdppw4lwfa77ydb22rfnf6y9sh0pifj7ah5drf";
-    inherit dependencies buildDependencies features;
-  };
-  term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "term_size";
-    version = "0.3.0";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" "Benjamin Sago <ogham@bsago.me>" ];
-    sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs";
-    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_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "textwrap";
-    version = "0.8.0";
-    authors = [ "Martin Geisler <martin@geisler.net>" ];
-    sha256 = "02j8apii1032cvp9fwrxw4pf11xb287j2n1iv1iixp8yh6vzrq41";
-    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;
-  };
-  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;
-  };
-  way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "way-cooler-client-helpers";
-    version = "0.1.0";
-    authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
-    sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_client_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-client";
-    version = "0.9.10";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1cs7zwvqahiysnfqfask96zpfr2bp47dlwwwd9ap8ccvcjbspj67";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_scanner_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-scanner";
-    version = "0.9.10";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "0vhnj3vfnrknvdmy72pjh7dck5q5sz1v8kfr0qqzkqf0ylavvyb2";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-sys";
-    version = "0.9.10";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
-    inherit dependencies buildDependencies features;
-  };
-  wc_bg_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wc-bg";
-    version = "0.3.0";
-    authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
-    sha256 = "1jywymr80k96481vr6nyyqhlf2gj2n2zgvkwkny2m84v9n3pqn62";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  xml_rs_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "xml-rs";
-    version = "0.6.1";
-    authors = [ "Vladimir Matveev <vladimir.matweev@gmail.com>" ];
-    sha256 = "0adjwgmn061p60n81s52a9p26y2jdc20wvinsyw2nzmby5wvnbwk";
-    libPath = "src/lib.rs";
-    libName = "xml";
-    crateBin = [ {  name = "xml-analyze";  path = "src/analyze.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
-  ansi_term_0_9_0_features = f: updateFeatures f ({
-    ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
-  }) [];
-  atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ {
-    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-  };
-  atty_0_2_3_features = f: updateFeatures f ({
-    atty_0_2_3.default = (f.atty_0_2_3.default or true);
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_32.default = (f.libc_0_2_32.default or false);
-    termion_1_5_1.default = true;
-    winapi_0_2_8.default = true;
-  }) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
-  bitflags_0_7_0_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
-  }) [];
-  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
-    features = mkFeatures (features.bitflags_0_9_1 or {});
-  };
-  bitflags_0_9_1_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
-    bitflags_0_9_1.example_generated =
-      (f.bitflags_0_9_1.example_generated or false) ||
-      (f.bitflags_0_9_1.default or false) ||
-      (bitflags_0_9_1.default or false);
-  }) [];
-  byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ {
-    features = mkFeatures (features.byteorder_0_5_3 or {});
-  };
-  byteorder_0_5_3_features = f: updateFeatures f (rec {
-    byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true);
-    byteorder_0_5_3.std =
-      (f.byteorder_0_5_3.std or false) ||
-      (f.byteorder_0_5_3.default or false) ||
-      (byteorder_0_5_3.default or false);
-  }) [];
-  byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ {
-    features = mkFeatures (features.byteorder_1_1_0 or {});
-  };
-  byteorder_1_1_0_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true);
-    byteorder_1_1_0.std =
-      (f.byteorder_1_1_0.std or false) ||
-      (f.byteorder_1_1_0.default or false) ||
-      (byteorder_1_1_0.default or false);
-  }) [];
-  cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.cc_1_0_0 or {});
-  };
-  cc_1_0_0_features = f: updateFeatures f (rec {
-    cc_1_0_0.default = (f.cc_1_0_0.default or true);
-    cc_1_0_0.rayon =
-      (f.cc_1_0_0.rayon or false) ||
-      (f.cc_1_0_0.parallel or false) ||
-      (cc_1_0_0.parallel or false);
-  }) [];
-  clap_2_26_2 = { features?(clap_2_26_2_features {}) }: clap_2_26_2_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 textwrap_0_8_0 unicode_width_0_1_4 vec_map_0_8_0 ]
-      ++ (if features.clap_2_26_2.ansi_term or false then [ ansi_term_0_9_0 ] else [])
-      ++ (if features.clap_2_26_2.atty or false then [ atty_0_2_3 ] else [])
-      ++ (if features.clap_2_26_2.strsim or false then [ strsim_0_6_0 ] else [])
-      ++ (if features.clap_2_26_2.term_size or false then [ term_size_0_3_0 ] else []));
-    features = mkFeatures (features.clap_2_26_2 or {});
-  };
-  clap_2_26_2_features = f: updateFeatures f (rec {
-    ansi_term_0_9_0.default = true;
-    atty_0_2_3.default = true;
-    bitflags_0_9_1.default = true;
-    clap_2_26_2.ansi_term =
-      (f.clap_2_26_2.ansi_term or false) ||
-      (f.clap_2_26_2.color or false) ||
-      (clap_2_26_2.color or false);
-    clap_2_26_2.atty =
-      (f.clap_2_26_2.atty or false) ||
-      (f.clap_2_26_2.color or false) ||
-      (clap_2_26_2.color or false);
-    clap_2_26_2.clippy =
-      (f.clap_2_26_2.clippy or false) ||
-      (f.clap_2_26_2.lints or false) ||
-      (clap_2_26_2.lints or false);
-    clap_2_26_2.color =
-      (f.clap_2_26_2.color or false) ||
-      (f.clap_2_26_2.default or false) ||
-      (clap_2_26_2.default or false);
-    clap_2_26_2.default = (f.clap_2_26_2.default or true);
-    clap_2_26_2.strsim =
-      (f.clap_2_26_2.strsim or false) ||
-      (f.clap_2_26_2.suggestions or false) ||
-      (clap_2_26_2.suggestions or false);
-    clap_2_26_2.suggestions =
-      (f.clap_2_26_2.suggestions or false) ||
-      (f.clap_2_26_2.default or false) ||
-      (clap_2_26_2.default or false);
-    clap_2_26_2.term_size =
-      (f.clap_2_26_2.term_size or false) ||
-      (f.clap_2_26_2.wrap_help or false) ||
-      (clap_2_26_2.wrap_help or false);
-    clap_2_26_2.wrap_help =
-      (f.clap_2_26_2.wrap_help or false) ||
-      (f.clap_2_26_2.default or false) ||
-      (clap_2_26_2.default or false);
-    clap_2_26_2.yaml =
-      (f.clap_2_26_2.yaml or false) ||
-      (f.clap_2_26_2.doc or false) ||
-      (clap_2_26_2.doc or false);
-    clap_2_26_2.yaml-rust =
-      (f.clap_2_26_2.yaml-rust or false) ||
-      (f.clap_2_26_2.yaml or false) ||
-      (clap_2_26_2.yaml or false);
-    strsim_0_6_0.default = true;
-    term_size_0_3_0.default = true;
-    textwrap_0_8_0.default = true;
-    unicode_width_0_1_4.default = true;
-    vec_map_0_8_0.default = true;
-  }) [ ansi_term_0_9_0_features atty_0_2_3_features bitflags_0_9_1_features strsim_0_6_0_features term_size_0_3_0_features textwrap_0_8_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ];
-  coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ {
-    dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
-    features = mkFeatures (features.coco_0_1_1 or {});
-  };
-  coco_0_1_1_features = f: updateFeatures f ({
-    coco_0_1_1.default = (f.coco_0_1_1.default or true);
-    either_1_2_0.default = true;
-    scopeguard_0_3_2.default = true;
-  }) [ either_1_2_0_features scopeguard_0_3_2_features ];
-  color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
-  color_quant_1_0_0_features = f: updateFeatures f ({
-    color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
-  }) [];
-  dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ {
-    dependencies = mapFeatures features ([ libloading_0_3_4 ]);
-    features = mkFeatures (features.dlib_0_3_1 or {});
-  };
-  dlib_0_3_1_features = f: updateFeatures f ({
-    dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
-    libloading_0_3_4.default = true;
-  }) [ libloading_0_3_4_features ];
-  dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
-  dtoa_0_4_2_features = f: updateFeatures f ({
-    dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
-  }) [];
-  either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
-    features = mkFeatures (features.either_1_2_0 or {});
-  };
-  either_1_2_0_features = f: updateFeatures f (rec {
-    either_1_2_0.default = (f.either_1_2_0.default or true);
-    either_1_2_0.use_std =
-      (f.either_1_2_0.use_std or false) ||
-      (f.either_1_2_0.default or false) ||
-      (either_1_2_0.default or false);
-  }) [];
-  enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
-  };
-  enum_primitive_0_1_1_features = f: updateFeatures f ({
-    enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
-    num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false);
-  }) [ num_traits_0_1_40_features ];
-  flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ {
-    dependencies = mapFeatures features ([ libc_0_2_32 ]
-      ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else []));
-    features = mkFeatures (features.flate2_0_2_20 or {});
-  };
-  flate2_0_2_20_features = f: updateFeatures f (rec {
-    flate2_0_2_20.default = (f.flate2_0_2_20.default or true);
-    flate2_0_2_20.futures =
-      (f.flate2_0_2_20.futures or false) ||
-      (f.flate2_0_2_20.tokio or false) ||
-      (flate2_0_2_20.tokio or false);
-    flate2_0_2_20.libz-sys =
-      (f.flate2_0_2_20.libz-sys or false) ||
-      (f.flate2_0_2_20.zlib or false) ||
-      (flate2_0_2_20.zlib or false);
-    flate2_0_2_20.miniz-sys =
-      (f.flate2_0_2_20.miniz-sys or false) ||
-      (f.flate2_0_2_20.default or false) ||
-      (flate2_0_2_20.default or false);
-    flate2_0_2_20.tokio-io =
-      (f.flate2_0_2_20.tokio-io or false) ||
-      (f.flate2_0_2_20.tokio or false) ||
-      (flate2_0_2_20.tokio or false);
-    libc_0_2_32.default = true;
-    miniz_sys_0_1_10.default = true;
-  }) [ libc_0_2_32_features miniz_sys_0_1_10_features ];
-  fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ {
-    dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]);
-  };
-  fuchsia_zircon_0_2_1_features = f: updateFeatures f ({
-    fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true);
-    fuchsia_zircon_sys_0_2_0.default = true;
-  }) [ fuchsia_zircon_sys_0_2_0_features ];
-  fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
-  };
-  fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = true;
-    fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true);
-  }) [ bitflags_0_7_0_features ];
-  futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ {
-    features = mkFeatures (features.futures_0_1_16 or {});
-  };
-  futures_0_1_16_features = f: updateFeatures f (rec {
-    futures_0_1_16.default = (f.futures_0_1_16.default or true);
-    futures_0_1_16.use_std =
-      (f.futures_0_1_16.use_std or false) ||
-      (f.futures_0_1_16.default or false) ||
-      (futures_0_1_16.default or false);
-    futures_0_1_16.with-deprecated =
-      (f.futures_0_1_16.with-deprecated or false) ||
-      (f.futures_0_1_16.default or false) ||
-      (futures_0_1_16.default or false);
-  }) [];
-  gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ {
-    dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]);
-    features = mkFeatures (features.gif_0_9_2 or {});
-  };
-  gif_0_9_2_features = f: updateFeatures f (rec {
-    color_quant_1_0_0.default = true;
-    gif_0_9_2.default = (f.gif_0_9_2.default or true);
-    gif_0_9_2.libc =
-      (f.gif_0_9_2.libc or false) ||
-      (f.gif_0_9_2.c_api or false) ||
-      (gif_0_9_2.c_api or false);
-    gif_0_9_2.raii_no_panic =
-      (f.gif_0_9_2.raii_no_panic or false) ||
-      (f.gif_0_9_2.default or false) ||
-      (gif_0_9_2.default or false);
-    lzw_0_10_0.default = true;
-  }) [ color_quant_1_0_0_features lzw_0_10_0_features ];
-  glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
-  glob_0_2_11_features = f: updateFeatures f ({
-    glob_0_2_11.default = (f.glob_0_2_11.default or true);
-  }) [];
-  image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
-    dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_40 ]
-      ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else [])
-      ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else [])
-      ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else [])
-      ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else []));
-    features = mkFeatures (features.image_0_10_4 or {});
-  };
-  image_0_10_4_features = f: updateFeatures f (rec {
-    byteorder_0_5_3.default = true;
-    enum_primitive_0_1_1.default = true;
-    gif_0_9_2.default = true;
-    glob_0_2_11.default = true;
-    image_0_10_4.bmp =
-      (f.image_0_10_4.bmp or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false) ||
-      (f.image_0_10_4.ico or false) ||
-      (image_0_10_4.ico or false);
-    image_0_10_4.default = (f.image_0_10_4.default or true);
-    image_0_10_4.gif =
-      (f.image_0_10_4.gif or false) ||
-      (f.image_0_10_4.gif_codec or false) ||
-      (image_0_10_4.gif_codec or false);
-    image_0_10_4.gif_codec =
-      (f.image_0_10_4.gif_codec or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.hdr =
-      (f.image_0_10_4.hdr or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.ico =
-      (f.image_0_10_4.ico or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.jpeg =
-      (f.image_0_10_4.jpeg or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.jpeg-decoder =
-      (f.image_0_10_4.jpeg-decoder or false) ||
-      (f.image_0_10_4.jpeg or false) ||
-      (image_0_10_4.jpeg or false);
-    image_0_10_4.png =
-      (f.image_0_10_4.png or false) ||
-      (f.image_0_10_4.png_codec or false) ||
-      (image_0_10_4.png_codec or false);
-    image_0_10_4.png_codec =
-      (f.image_0_10_4.png_codec or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false) ||
-      (f.image_0_10_4.ico or false) ||
-      (image_0_10_4.ico or false);
-    image_0_10_4.ppm =
-      (f.image_0_10_4.ppm or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.scoped_threadpool =
-      (f.image_0_10_4.scoped_threadpool or false) ||
-      (f.image_0_10_4.hdr or false) ||
-      (image_0_10_4.hdr or false);
-    image_0_10_4.tga =
-      (f.image_0_10_4.tga or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.tiff =
-      (f.image_0_10_4.tiff or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.webp =
-      (f.image_0_10_4.webp or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    jpeg_decoder_0_1_13.default = true;
-    num_iter_0_1_34.default = true;
-    num_rational_0_1_39.default = true;
-    num_traits_0_1_40.default = true;
-    png_0_5_2.default = true;
-    scoped_threadpool_0_1_8.default = true;
-  }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_40_features png_0_5_2_features scoped_threadpool_0_1_8_features ];
-  inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
-    features = mkFeatures (features.inflate_0_1_1 or {});
-  };
-  inflate_0_1_1_features = f: updateFeatures f ({
-    inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
-  }) [];
-  itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ {
-    features = mkFeatures (features.itoa_0_3_4 or {});
-  };
-  itoa_0_3_4_features = f: updateFeatures f ({
-    itoa_0_3_4.default = (f.itoa_0_3_4.default or true);
-  }) [];
-  jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
-    dependencies = mapFeatures features ([ byteorder_1_1_0 ]
-      ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else []));
-    features = mkFeatures (features.jpeg_decoder_0_1_13 or {});
-  };
-  jpeg_decoder_0_1_13_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = true;
-    jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true);
-    jpeg_decoder_0_1_13.rayon =
-      (f.jpeg_decoder_0_1_13.rayon or false) ||
-      (f.jpeg_decoder_0_1_13.default or false) ||
-      (jpeg_decoder_0_1_13.default or false);
-    rayon_0_8_2.default = true;
-  }) [ byteorder_1_1_0_features rayon_0_8_2_features ];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  lazy_static_0_2_9 = { features?(lazy_static_0_2_9_features {}) }: lazy_static_0_2_9_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_0_2_9 or {});
-  };
-  lazy_static_0_2_9_features = f: updateFeatures f (rec {
-    lazy_static_0_2_9.default = (f.lazy_static_0_2_9.default or true);
-    lazy_static_0_2_9.nightly =
-      (f.lazy_static_0_2_9.nightly or false) ||
-      (f.lazy_static_0_2_9.spin_no_std or false) ||
-      (lazy_static_0_2_9.spin_no_std or false);
-    lazy_static_0_2_9.spin =
-      (f.lazy_static_0_2_9.spin or false) ||
-      (f.lazy_static_0_2_9.spin_no_std or false) ||
-      (lazy_static_0_2_9.spin_no_std or false);
-  }) [];
-  libc_0_2_32 = { features?(libc_0_2_32_features {}) }: libc_0_2_32_ {
-    features = mkFeatures (features.libc_0_2_32 or {});
-  };
-  libc_0_2_32_features = f: updateFeatures f (rec {
-    libc_0_2_32.default = (f.libc_0_2_32.default or true);
-    libc_0_2_32.use_std =
-      (f.libc_0_2_32.use_std or false) ||
-      (f.libc_0_2_32.default or false) ||
-      (libc_0_2_32.default or false);
-  }) [];
-  libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_9 ])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
-  };
-  libloading_0_3_4_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = true;
-    lazy_static_0_2_9.default = true;
-    libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
-    target_build_utils_0_3_1.default = true;
-    winapi_0_2_8.default = true;
-  }) [ lazy_static_0_2_9_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ {
-    features = mkFeatures (features.lzw_0_10_0 or {});
-  };
-  lzw_0_10_0_features = f: updateFeatures f (rec {
-    lzw_0_10_0.default = (f.lzw_0_10_0.default or true);
-    lzw_0_10_0.raii_no_panic =
-      (f.lzw_0_10_0.raii_no_panic or false) ||
-      (f.lzw_0_10_0.default or false) ||
-      (lzw_0_10_0.default or false);
-  }) [];
-  miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ {
-    dependencies = mapFeatures features ([ libc_0_2_32 ]);
-    buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
-  };
-  miniz_sys_0_1_10_features = f: updateFeatures f ({
-    cc_1_0_0.default = true;
-    libc_0_2_32.default = true;
-    miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
-  }) [ libc_0_2_32_features cc_1_0_0_features ];
-  num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]
-      ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_17 ] else [])
-      ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else []));
-    features = mkFeatures (features.num_bigint_0_1_40 or {});
-  };
-  num_bigint_0_1_40_features = f: updateFeatures f (rec {
-    num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true);
-    num_bigint_0_1_40.rand =
-      (f.num_bigint_0_1_40.rand or false) ||
-      (f.num_bigint_0_1_40.default or false) ||
-      (num_bigint_0_1_40.default or false);
-    num_bigint_0_1_40.rustc-serialize =
-      (f.num_bigint_0_1_40.rustc-serialize or false) ||
-      (f.num_bigint_0_1_40.default or false) ||
-      (num_bigint_0_1_40.default or false);
-    num_integer_0_1_35.default = true;
-    num_traits_0_1_40.default = true;
-    rand_0_3_17.default = true;
-    rustc_serialize_0_3_24.default = true;
-  }) [ num_integer_0_1_35_features num_traits_0_1_40_features rand_0_3_17_features rustc_serialize_0_3_24_features ];
-  num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
-  };
-  num_integer_0_1_35_features = f: updateFeatures f ({
-    num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
-    num_traits_0_1_40.default = true;
-  }) [ num_traits_0_1_40_features ];
-  num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]);
-  };
-  num_iter_0_1_34_features = f: updateFeatures f ({
-    num_integer_0_1_35.default = true;
-    num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
-    num_traits_0_1_40.default = true;
-  }) [ num_integer_0_1_35_features num_traits_0_1_40_features ];
-  num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]
-      ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else [])
-      ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else []));
-    features = mkFeatures (features.num_rational_0_1_39 or {});
-  };
-  num_rational_0_1_39_features = f: updateFeatures f (rec {
-    num_bigint_0_1_40.default = true;
-    num_integer_0_1_35.default = true;
-    num_rational_0_1_39.bigint =
-      (f.num_rational_0_1_39.bigint or false) ||
-      (f.num_rational_0_1_39.default or false) ||
-      (num_rational_0_1_39.default or false);
-    num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true);
-    num_rational_0_1_39.num-bigint =
-      (f.num_rational_0_1_39.num-bigint or false) ||
-      (f.num_rational_0_1_39.bigint or false) ||
-      (num_rational_0_1_39.bigint or false);
-    num_rational_0_1_39.rustc-serialize =
-      (f.num_rational_0_1_39.rustc-serialize or false) ||
-      (f.num_rational_0_1_39.default or false) ||
-      (num_rational_0_1_39.default or false);
-    num_traits_0_1_40.default = true;
-    rustc_serialize_0_3_24.default = true;
-  }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ];
-  num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
-  num_traits_0_1_40_features = f: updateFeatures f ({
-    num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
-  }) [];
-  num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ {
-    dependencies = mapFeatures features ([ libc_0_2_32 ]);
-  };
-  num_cpus_1_7_0_features = f: updateFeatures f ({
-    libc_0_2_32.default = true;
-    num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true);
-  }) [ libc_0_2_32_features ];
-  phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_21 ]);
-    features = mkFeatures (features.phf_0_7_21 or {});
-  };
-  phf_0_7_21_features = f: updateFeatures f (rec {
-    phf_0_7_21.default = (f.phf_0_7_21.default or true);
-    phf_shared_0_7_21.core =
-      (f.phf_shared_0_7_21.core or false) ||
-      (phf_0_7_21.core or false) ||
-      (f.phf_0_7_21.core or false);
-    phf_shared_0_7_21.default = true;
-    phf_shared_0_7_21.unicase =
-      (f.phf_shared_0_7_21.unicase or false) ||
-      (phf_0_7_21.unicase or false) ||
-      (f.phf_0_7_21.unicase or false);
-  }) [ phf_shared_0_7_21_features ];
-  phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
-  };
-  phf_codegen_0_7_21_features = f: updateFeatures f ({
-    phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
-    phf_generator_0_7_21.default = true;
-    phf_shared_0_7_21.default = true;
-  }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ];
-  phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]);
-  };
-  phf_generator_0_7_21_features = f: updateFeatures f ({
-    phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
-    phf_shared_0_7_21.default = true;
-    rand_0_3_17.default = true;
-  }) [ phf_shared_0_7_21_features rand_0_3_17_features ];
-  phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ {
-    dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
-    features = mkFeatures (features.phf_shared_0_7_21 or {});
-  };
-  phf_shared_0_7_21_features = f: updateFeatures f ({
-    phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
-    siphasher_0_2_2.default = true;
-  }) [ siphasher_0_2_2_features ];
-  png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ]
-      ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else []));
-    features = mkFeatures (features.png_0_5_2 or {});
-  };
-  png_0_5_2_features = f: updateFeatures f (rec {
-    bitflags_0_7_0.default = true;
-    flate2_0_2_20.default = true;
-    inflate_0_1_1.default = true;
-    num_iter_0_1_34.default = true;
-    png_0_5_2.default = (f.png_0_5_2.default or true);
-    png_0_5_2.flate2 =
-      (f.png_0_5_2.flate2 or false) ||
-      (f.png_0_5_2.png-encoding or false) ||
-      (png_0_5_2.png-encoding or false);
-    png_0_5_2.png-encoding =
-      (f.png_0_5_2.png-encoding or false) ||
-      (f.png_0_5_2.default or false) ||
-      (png_0_5_2.default or false);
-  }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ];
-  rand_0_3_17 = { features?(rand_0_3_17_features {}) }: rand_0_3_17_ {
-    dependencies = mapFeatures features ([ libc_0_2_32 ])
-      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []);
-    features = mkFeatures (features.rand_0_3_17 or {});
-  };
-  rand_0_3_17_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_2_1.default = true;
-    libc_0_2_32.default = true;
-    rand_0_3_17.default = (f.rand_0_3_17.default or true);
-    rand_0_3_17.i128_support =
-      (f.rand_0_3_17.i128_support or false) ||
-      (f.rand_0_3_17.nightly or false) ||
-      (rand_0_3_17.nightly or false);
-  }) [ libc_0_2_32_features fuchsia_zircon_0_2_1_features ];
-  rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
-    dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
-  };
-  rayon_0_8_2_features = f: updateFeatures f ({
-    rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
-    rayon_core_1_2_1.default = true;
-  }) [ rayon_core_1_2_1_features ];
-  rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
-    dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]);
-  };
-  rayon_core_1_2_1_features = f: updateFeatures f ({
-    coco_0_1_1.default = true;
-    futures_0_1_16.default = true;
-    lazy_static_0_2_9.default = true;
-    libc_0_2_32.default = true;
-    num_cpus_1_7_0.default = true;
-    rand_0_3_17.default = true;
-    rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
-  }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ];
-  redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {};
-  redox_syscall_0_1_31_features = f: updateFeatures f ({
-    redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.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_31 ]);
-  };
-  redox_termios_0_1_1_features = f: updateFeatures f ({
-    redox_syscall_0_1_31.default = true;
-    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
-  }) [ redox_syscall_0_1_31_features ];
-  rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
-  rustc_serialize_0_3_24_features = f: updateFeatures f ({
-    rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
-  }) [];
-  scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
-    features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
-  };
-  scoped_threadpool_0_1_8_features = f: updateFeatures f ({
-    scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
-  }) [];
-  scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
-    features = mkFeatures (features.scopeguard_0_3_2 or {});
-  };
-  scopeguard_0_3_2_features = f: updateFeatures f (rec {
-    scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true);
-    scopeguard_0_3_2.use_std =
-      (f.scopeguard_0_3_2.use_std or false) ||
-      (f.scopeguard_0_3_2.default or false) ||
-      (scopeguard_0_3_2.default or false);
-  }) [];
-  serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_0_9_15 or {});
-  };
-  serde_0_9_15_features = f: updateFeatures f (rec {
-    serde_0_9_15.alloc =
-      (f.serde_0_9_15.alloc or false) ||
-      (f.serde_0_9_15.collections or false) ||
-      (serde_0_9_15.collections or false);
-    serde_0_9_15.default = (f.serde_0_9_15.default or true);
-    serde_0_9_15.serde_derive =
-      (f.serde_0_9_15.serde_derive or false) ||
-      (f.serde_0_9_15.derive or false) ||
-      (serde_0_9_15.derive or false) ||
-      (f.serde_0_9_15.playground or false) ||
-      (serde_0_9_15.playground or false);
-    serde_0_9_15.std =
-      (f.serde_0_9_15.std or false) ||
-      (f.serde_0_9_15.default or false) ||
-      (serde_0_9_15.default or false) ||
-      (f.serde_0_9_15.unstable-testing or false) ||
-      (serde_0_9_15.unstable-testing or false);
-    serde_0_9_15.unstable =
-      (f.serde_0_9_15.unstable or false) ||
-      (f.serde_0_9_15.alloc or false) ||
-      (serde_0_9_15.alloc or false) ||
-      (f.serde_0_9_15.unstable-testing or false) ||
-      (serde_0_9_15.unstable-testing or false);
-  }) [];
-  serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_0_9_15 ]);
-    features = mkFeatures (features.serde_json_0_9_10 or {});
-  };
-  serde_json_0_9_10_features = f: updateFeatures f (rec {
-    dtoa_0_4_2.default = true;
-    itoa_0_3_4.default = true;
-    num_traits_0_1_40.default = true;
-    serde_0_9_15.default = true;
-    serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true);
-    serde_json_0_9_10.linked-hash-map =
-      (f.serde_json_0_9_10.linked-hash-map or false) ||
-      (f.serde_json_0_9_10.preserve_order or false) ||
-      (serde_json_0_9_10.preserve_order or false);
-  }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_0_9_15_features ];
-  siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
-    dependencies = mapFeatures features ([]);
-  };
-  siphasher_0_2_2_features = f: updateFeatures f ({
-    siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
-  }) [];
-  strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
-  strsim_0_6_0_features = f: updateFeatures f ({
-    strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
-  }) [];
-  target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
-    dependencies = mapFeatures features ([ phf_0_7_21 ]
-      ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else []));
-    buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]);
-    features = mkFeatures (features.target_build_utils_0_3_1 or {});
-  };
-  target_build_utils_0_3_1_features = f: updateFeatures f (rec {
-    phf_0_7_21.default = true;
-    phf_codegen_0_7_21.default = true;
-    serde_json_0_9_10.default = true;
-    target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true);
-    target_build_utils_0_3_1.serde_json =
-      (f.target_build_utils_0_3_1.serde_json or false) ||
-      (f.target_build_utils_0_3_1.default or false) ||
-      (target_build_utils_0_3_1.default or false);
-  }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ];
-  tempfile_2_2_0 = { features?(tempfile_2_2_0_features {}) }: tempfile_2_2_0_ {
-    dependencies = mapFeatures features ([ rand_0_3_17 ])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-  };
-  tempfile_2_2_0_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_32.default = true;
-    rand_0_3_17.default = true;
-    redox_syscall_0_1_31.default = true;
-    tempfile_2_2_0.default = (f.tempfile_2_2_0.default or true);
-    winapi_0_2_8.default = true;
-  }) [ rand_0_3_17_features redox_syscall_0_1_31_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ {
-    dependencies = mapFeatures features ([])
-      ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_32 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    features = mkFeatures (features.term_size_0_3_0 or {});
-  };
-  term_size_0_3_0_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_32.default = true;
-    term_size_0_3_0.clippy =
-      (f.term_size_0_3_0.clippy or false) ||
-      (f.term_size_0_3_0.lints or false) ||
-      (term_size_0_3_0.lints or false);
-    term_size_0_3_0.default = (f.term_size_0_3_0.default or true);
-    term_size_0_3_0.lints =
-      (f.term_size_0_3_0.lints or false) ||
-      (f.term_size_0_3_0.travis or false) ||
-      (term_size_0_3_0.travis or false);
-    term_size_0_3_0.nightly =
-      (f.term_size_0_3_0.nightly or false) ||
-      (f.term_size_0_3_0.lints or false) ||
-      (term_size_0_3_0.lints or false) ||
-      (f.term_size_0_3_0.travis or false) ||
-      (term_size_0_3_0.travis or false);
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_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_32 ]) else [])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []);
-  };
-  termion_1_5_1_features = f: updateFeatures f ({
-    libc_0_2_32.default = true;
-    redox_syscall_0_1_31.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_32_features redox_syscall_0_1_31_features redox_termios_0_1_1_features ];
-  textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ {
-    dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]);
-  };
-  textwrap_0_8_0_features = f: updateFeatures f ({
-    term_size_0_3_0.default = true;
-    textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true);
-    unicode_width_0_1_4.default = true;
-  }) [ term_size_0_3_0_features unicode_width_0_1_4_features ];
-  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 ({
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.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);
-  }) [];
-  way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
-    dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]);
-  };
-  way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
-    way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
-    wayland_client_0_9_10.cursor = true;
-    wayland_client_0_9_10.default = true;
-    wayland_client_0_9_10.dlopen = true;
-    wayland_sys_0_9_10.client = true;
-    wayland_sys_0_9_10.default = true;
-    wayland_sys_0_9_10.dlopen = true;
-  }) [ wayland_client_0_9_10_features wayland_sys_0_9_10_features ];
-  wayland_client_0_9_10 = { features?(wayland_client_0_9_10_features {}) }: wayland_client_0_9_10_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_32 wayland_sys_0_9_10 ]);
-    buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]);
-    features = mkFeatures (features.wayland_client_0_9_10 or {});
-  };
-  wayland_client_0_9_10_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = true;
-    libc_0_2_32.default = true;
-    wayland_client_0_9_10.cursor =
-      (f.wayland_client_0_9_10.cursor or false) ||
-      (f.wayland_client_0_9_10.default or false) ||
-      (wayland_client_0_9_10.default or false);
-    wayland_client_0_9_10.default = (f.wayland_client_0_9_10.default or true);
-    wayland_client_0_9_10.egl =
-      (f.wayland_client_0_9_10.egl or false) ||
-      (f.wayland_client_0_9_10.default or false) ||
-      (wayland_client_0_9_10.default or false);
-    wayland_scanner_0_9_10.default = true;
-    wayland_sys_0_9_10.client = true;
-    wayland_sys_0_9_10.cursor =
-      (f.wayland_sys_0_9_10.cursor or false) ||
-      (wayland_client_0_9_10.cursor or false) ||
-      (f.wayland_client_0_9_10.cursor or false);
-    wayland_sys_0_9_10.default = true;
-    wayland_sys_0_9_10.dlopen =
-      (f.wayland_sys_0_9_10.dlopen or false) ||
-      (wayland_client_0_9_10.dlopen or false) ||
-      (f.wayland_client_0_9_10.dlopen or false);
-    wayland_sys_0_9_10.egl =
-      (f.wayland_sys_0_9_10.egl or false) ||
-      (wayland_client_0_9_10.egl or false) ||
-      (f.wayland_client_0_9_10.egl or false);
-  }) [ bitflags_0_9_1_features libc_0_2_32_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ];
-  wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ {
-    dependencies = mapFeatures features ([ xml_rs_0_6_1 ]);
-  };
-  wayland_scanner_0_9_10_features = f: updateFeatures f ({
-    wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true);
-    xml_rs_0_6_1.default = true;
-  }) [ xml_rs_0_6_1_features ];
-  wayland_sys_0_9_10 = { features?(wayland_sys_0_9_10_features {}) }: wayland_sys_0_9_10_ {
-    dependencies = mapFeatures features ([ dlib_0_3_1 ]
-      ++ (if features.wayland_sys_0_9_10.lazy_static or false then [ lazy_static_0_2_9 ] else []));
-    features = mkFeatures (features.wayland_sys_0_9_10 or {});
-  };
-  wayland_sys_0_9_10_features = f: updateFeatures f (rec {
-    dlib_0_3_1.default = true;
-    dlib_0_3_1.dlopen =
-      (f.dlib_0_3_1.dlopen or false) ||
-      (wayland_sys_0_9_10.dlopen or false) ||
-      (f.wayland_sys_0_9_10.dlopen or false);
-    lazy_static_0_2_9.default = true;
-    wayland_sys_0_9_10.default = (f.wayland_sys_0_9_10.default or true);
-    wayland_sys_0_9_10.lazy_static =
-      (f.wayland_sys_0_9_10.lazy_static or false) ||
-      (f.wayland_sys_0_9_10.dlopen or false) ||
-      (wayland_sys_0_9_10.dlopen or false);
-    wayland_sys_0_9_10.libc =
-      (f.wayland_sys_0_9_10.libc or false) ||
-      (f.wayland_sys_0_9_10.server or false) ||
-      (wayland_sys_0_9_10.server or false);
-  }) [ dlib_0_3_1_features lazy_static_0_2_9_features ];
-  wc_bg_0_3_0 = { features?(wc_bg_0_3_0_features {}) }: wc_bg_0_3_0_ {
-    dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]);
-    buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]);
-  };
-  wc_bg_0_3_0_features = f: updateFeatures f ({
-    byteorder_0_5_3.default = true;
-    clap_2_26_2.default = true;
-    image_0_10_4.default = true;
-    tempfile_2_2_0.default = true;
-    way_cooler_client_helpers_0_1_0.default = true;
-    wayland_client_0_9_10.cursor = true;
-    wayland_client_0_9_10.default = true;
-    wayland_client_0_9_10.dlopen = true;
-    wayland_scanner_0_9_10.default = true;
-    wayland_sys_0_9_10.client = true;
-    wayland_sys_0_9_10.default = true;
-    wayland_sys_0_9_10.dlopen = true;
-    wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true);
-  }) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f ({
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f ({
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-  xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 ]);
-  };
-  xml_rs_0_6_1_features = f: updateFeatures f ({
-    bitflags_0_9_1.default = true;
-    xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true);
-  }) [ bitflags_0_9_1_features ];
-}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
deleted file mode 100644
index 3264357b2fdb..000000000000
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ /dev/null
@@ -1,794 +0,0 @@
-# Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.hostPlatform.parsed.kernel.name;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  wc_grab = f: wc_grab_0_3_0 { features = wc_grab_0_3_0_features { wc_grab_0_3_0 = f; }; };
-  adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "adler32";
-    version = "1.0.0";
-    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
-    sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w";
-    inherit dependencies buildDependencies features;
-  };
-  ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.9.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ];
-    sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.2";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.7.0";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.8.0";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1";
-    inherit dependencies buildDependencies features;
-  };
-  clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "clap";
-    version = "2.22.0";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
-    sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd";
-    inherit dependencies buildDependencies features;
-  };
-  color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "color_quant";
-    version = "1.0.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj";
-    inherit dependencies buildDependencies features;
-  };
-  dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dbus";
-    version = "0.5.2";
-    authors = [ "David Henningsson <diwic@ubuntu.com>" ];
-    sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "deflate";
-    version = "0.7.5";
-    authors = [ "oyvindln <oyvindln@users.noreply.github.com>" ];
-    sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy";
-    inherit dependencies buildDependencies features;
-  };
-  deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "deque";
-    version = "0.3.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Samuel Fredrickson <kinghajj@gmail.com>" "Linus Färnstrand <faern@faern.net>" "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68";
-    inherit dependencies buildDependencies features;
-  };
-  enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "enum_primitive";
-    version = "0.1.1";
-    authors = [ "Anders Kaseorg <andersk@mit.edu>" ];
-    sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y";
-    inherit dependencies buildDependencies features;
-  };
-  error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "error-chain";
-    version = "0.7.2";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
-    sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi";
-    inherit dependencies buildDependencies features;
-  };
-  gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "gif";
-    version = "0.9.1";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r";
-    inherit dependencies buildDependencies features;
-  };
-  glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "glob";
-    version = "0.2.11";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
-    inherit dependencies buildDependencies features;
-  };
-  image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "image";
-    version = "0.12.3";
-    authors = [ "ccgn" "bvssvni <bvssvni@gmail.com>" "nwin" "TyOverby <ty@pre-alpha.com>" ];
-    sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9";
-    libPath = "./src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "inflate";
-    version = "0.1.1";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h";
-    inherit dependencies buildDependencies features;
-  };
-  jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "jpeg-decoder";
-    version = "0.1.11";
-    authors = [ "Ulf Nilsson <kaksmet@gmail.com>" ];
-    sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.21";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75";
-    inherit dependencies buildDependencies features;
-  };
-  lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lzw";
-    version = "0.10.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb";
-    inherit dependencies buildDependencies features;
-  };
-  metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "metadeps";
-    version = "1.1.1";
-    authors = [ "Josh Triplett <josh@joshtriplett.org>" ];
-    sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar";
-    inherit dependencies buildDependencies features;
-  };
-  num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-integer";
-    version = "0.1.33";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729";
-    inherit dependencies buildDependencies features;
-  };
-  num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-iter";
-    version = "0.1.33";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3";
-    inherit dependencies buildDependencies features;
-  };
-  num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-rational";
-    version = "0.1.36";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.1.37";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
-    inherit dependencies buildDependencies features;
-  };
-  num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num_cpus";
-    version = "1.3.0";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb";
-    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;
-  };
-  png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "png";
-    version = "0.6.2";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.15";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
-    inherit dependencies buildDependencies features;
-  };
-  rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rayon";
-    version = "0.6.0";
-    authors = [ "Niko Matsakis <niko@alum.mit.edu>" ];
-    sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97";
-    inherit dependencies buildDependencies features;
-  };
-  scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scoped_threadpool";
-    version = "0.1.7";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.6.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
-    inherit dependencies buildDependencies features;
-  };
-  term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "term_size";
-    version = "0.2.3";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" "Benjamin Sago <ogham@bsago.me>" ];
-    sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci";
-    inherit dependencies buildDependencies features;
-  };
-  toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml";
-    version = "0.2.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-segmentation";
-    version = "1.1.0";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0";
-    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;
-  };
-  vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vec_map";
-    version = "0.7.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 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1";
-    inherit dependencies buildDependencies features;
-  };
-  wc_grab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wc-grab";
-    version = "0.3.0";
-    authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
-    sha256 = "02dkjxffzh38h3hiwfypkjv0g8dsfkp9wk20j04x4qydg4dr8a8h";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
-  adler32_1_0_0_features = f: updateFeatures f ({
-    adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
-  }) [];
-  ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
-  ansi_term_0_9_0_features = f: updateFeatures f ({
-    ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
-  }) [];
-  atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
-    dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-  };
-  atty_0_2_2_features = f: updateFeatures f ({
-    atty_0_2_2.default = (f.atty_0_2_2.default or true);
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_21.default = true;
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
-  bitflags_0_7_0_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
-  }) [];
-  bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ {
-    features = mkFeatures (features.bitflags_0_8_0 or {});
-  };
-  bitflags_0_8_0_features = f: updateFeatures f (rec {
-    bitflags_0_8_0.default = (f.bitflags_0_8_0.default or true);
-    bitflags_0_8_0.i128 =
-      (f.bitflags_0_8_0.i128 or false) ||
-      (f.bitflags_0_8_0.unstable or false) ||
-      (bitflags_0_8_0.unstable or false);
-  }) [];
-  byteorder_1_0_0 = { features?(byteorder_1_0_0_features {}) }: byteorder_1_0_0_ {
-    features = mkFeatures (features.byteorder_1_0_0 or {});
-  };
-  byteorder_1_0_0_features = f: updateFeatures f (rec {
-    byteorder_1_0_0.default = (f.byteorder_1_0_0.default or true);
-    byteorder_1_0_0.std =
-      (f.byteorder_1_0_0.std or false) ||
-      (f.byteorder_1_0_0.default or false) ||
-      (byteorder_1_0_0.default or false);
-  }) [];
-  clap_2_22_0 = { features?(clap_2_22_0_features {}) }: clap_2_22_0_ {
-    dependencies = mapFeatures features ([ bitflags_0_8_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ]
-      ++ (if features.clap_2_22_0.ansi_term or false then [ ansi_term_0_9_0 ] else [])
-      ++ (if features.clap_2_22_0.atty or false then [ atty_0_2_2 ] else [])
-      ++ (if features.clap_2_22_0.strsim or false then [ strsim_0_6_0 ] else [])
-      ++ (if features.clap_2_22_0.term_size or false then [ term_size_0_2_3 ] else []));
-    features = mkFeatures (features.clap_2_22_0 or {});
-  };
-  clap_2_22_0_features = f: updateFeatures f (rec {
-    ansi_term_0_9_0.default = true;
-    atty_0_2_2.default = true;
-    bitflags_0_8_0.default = true;
-    clap_2_22_0.ansi_term =
-      (f.clap_2_22_0.ansi_term or false) ||
-      (f.clap_2_22_0.color or false) ||
-      (clap_2_22_0.color or false);
-    clap_2_22_0.atty =
-      (f.clap_2_22_0.atty or false) ||
-      (f.clap_2_22_0.color or false) ||
-      (clap_2_22_0.color or false);
-    clap_2_22_0.clippy =
-      (f.clap_2_22_0.clippy or false) ||
-      (f.clap_2_22_0.lints or false) ||
-      (clap_2_22_0.lints or false);
-    clap_2_22_0.color =
-      (f.clap_2_22_0.color or false) ||
-      (f.clap_2_22_0.default or false) ||
-      (clap_2_22_0.default or false);
-    clap_2_22_0.default = (f.clap_2_22_0.default or true);
-    clap_2_22_0.strsim =
-      (f.clap_2_22_0.strsim or false) ||
-      (f.clap_2_22_0.suggestions or false) ||
-      (clap_2_22_0.suggestions or false);
-    clap_2_22_0.suggestions =
-      (f.clap_2_22_0.suggestions or false) ||
-      (f.clap_2_22_0.default or false) ||
-      (clap_2_22_0.default or false);
-    clap_2_22_0.term_size =
-      (f.clap_2_22_0.term_size or false) ||
-      (f.clap_2_22_0.wrap_help or false) ||
-      (clap_2_22_0.wrap_help or false);
-    clap_2_22_0.wrap_help =
-      (f.clap_2_22_0.wrap_help or false) ||
-      (f.clap_2_22_0.default or false) ||
-      (clap_2_22_0.default or false);
-    clap_2_22_0.yaml-rust =
-      (f.clap_2_22_0.yaml-rust or false) ||
-      (f.clap_2_22_0.yaml or false) ||
-      (clap_2_22_0.yaml or false);
-    strsim_0_6_0.default = true;
-    term_size_0_2_3.default = true;
-    unicode_segmentation_1_1_0.default = true;
-    unicode_width_0_1_4.default = true;
-    vec_map_0_7_0.default = true;
-  }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ];
-  color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
-  color_quant_1_0_0_features = f: updateFeatures f ({
-    color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
-  }) [];
-  dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ {
-    dependencies = mapFeatures features ([ libc_0_2_21 ]);
-    buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]);
-    features = mkFeatures (features.dbus_0_5_2 or {});
-  };
-  dbus_0_5_2_features = f: updateFeatures f ({
-    dbus_0_5_2.default = (f.dbus_0_5_2.default or true);
-    libc_0_2_21.default = true;
-    metadeps_1_1_1.default = true;
-  }) [ libc_0_2_21_features metadeps_1_1_1_features ];
-  deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ {
-    dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]);
-  };
-  deflate_0_7_5_features = f: updateFeatures f ({
-    adler32_1_0_0.default = true;
-    byteorder_1_0_0.default = true;
-    deflate_0_7_5.default = (f.deflate_0_7_5.default or true);
-  }) [ adler32_1_0_0_features byteorder_1_0_0_features ];
-  deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ {
-    dependencies = mapFeatures features ([ rand_0_3_15 ]);
-  };
-  deque_0_3_1_features = f: updateFeatures f ({
-    deque_0_3_1.default = (f.deque_0_3_1.default or true);
-    rand_0_3_15.default = true;
-  }) [ rand_0_3_15_features ];
-  enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
-  };
-  enum_primitive_0_1_1_features = f: updateFeatures f ({
-    enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
-    num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
-  }) [ num_traits_0_1_37_features ];
-  error_chain_0_7_2 = { features?(error_chain_0_7_2_features {}) }: error_chain_0_7_2_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.error_chain_0_7_2 or {});
-  };
-  error_chain_0_7_2_features = f: updateFeatures f (rec {
-    error_chain_0_7_2.backtrace =
-      (f.error_chain_0_7_2.backtrace or false) ||
-      (f.error_chain_0_7_2.default or false) ||
-      (error_chain_0_7_2.default or false);
-    error_chain_0_7_2.default = (f.error_chain_0_7_2.default or true);
-    error_chain_0_7_2.example_generated =
-      (f.error_chain_0_7_2.example_generated or false) ||
-      (f.error_chain_0_7_2.default or false) ||
-      (error_chain_0_7_2.default or false);
-  }) [];
-  gif_0_9_1 = { features?(gif_0_9_1_features {}) }: gif_0_9_1_ {
-    dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]);
-    features = mkFeatures (features.gif_0_9_1 or {});
-  };
-  gif_0_9_1_features = f: updateFeatures f (rec {
-    color_quant_1_0_0.default = true;
-    gif_0_9_1.default = (f.gif_0_9_1.default or true);
-    gif_0_9_1.libc =
-      (f.gif_0_9_1.libc or false) ||
-      (f.gif_0_9_1.c_api or false) ||
-      (gif_0_9_1.c_api or false);
-    gif_0_9_1.raii_no_panic =
-      (f.gif_0_9_1.raii_no_panic or false) ||
-      (f.gif_0_9_1.default or false) ||
-      (gif_0_9_1.default or false);
-    lzw_0_10_0.default = true;
-  }) [ color_quant_1_0_0_features lzw_0_10_0_features ];
-  glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
-  glob_0_2_11_features = f: updateFeatures f ({
-    glob_0_2_11.default = (f.glob_0_2_11.default or true);
-  }) [];
-  image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ {
-    dependencies = mapFeatures features ([ byteorder_1_0_0 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 ]
-      ++ (if features.image_0_12_3.gif or false then [ gif_0_9_1 ] else [])
-      ++ (if features.image_0_12_3.jpeg-decoder or false then [ jpeg_decoder_0_1_11 ] else [])
-      ++ (if features.image_0_12_3.png or false then [ png_0_6_2 ] else [])
-      ++ (if features.image_0_12_3.scoped_threadpool or false then [ scoped_threadpool_0_1_7 ] else []));
-    features = mkFeatures (features.image_0_12_3 or {});
-  };
-  image_0_12_3_features = f: updateFeatures f (rec {
-    byteorder_1_0_0.default = true;
-    enum_primitive_0_1_1.default = true;
-    gif_0_9_1.default = true;
-    glob_0_2_11.default = true;
-    image_0_12_3.bmp =
-      (f.image_0_12_3.bmp or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false) ||
-      (f.image_0_12_3.ico or false) ||
-      (image_0_12_3.ico or false);
-    image_0_12_3.default = (f.image_0_12_3.default or true);
-    image_0_12_3.gif =
-      (f.image_0_12_3.gif or false) ||
-      (f.image_0_12_3.gif_codec or false) ||
-      (image_0_12_3.gif_codec or false);
-    image_0_12_3.gif_codec =
-      (f.image_0_12_3.gif_codec or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.hdr =
-      (f.image_0_12_3.hdr or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.ico =
-      (f.image_0_12_3.ico or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.jpeg =
-      (f.image_0_12_3.jpeg or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.jpeg-decoder =
-      (f.image_0_12_3.jpeg-decoder or false) ||
-      (f.image_0_12_3.jpeg or false) ||
-      (image_0_12_3.jpeg or false);
-    image_0_12_3.png =
-      (f.image_0_12_3.png or false) ||
-      (f.image_0_12_3.png_codec or false) ||
-      (image_0_12_3.png_codec or false);
-    image_0_12_3.png_codec =
-      (f.image_0_12_3.png_codec or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false) ||
-      (f.image_0_12_3.ico or false) ||
-      (image_0_12_3.ico or false);
-    image_0_12_3.ppm =
-      (f.image_0_12_3.ppm or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.scoped_threadpool =
-      (f.image_0_12_3.scoped_threadpool or false) ||
-      (f.image_0_12_3.hdr or false) ||
-      (image_0_12_3.hdr or false);
-    image_0_12_3.tga =
-      (f.image_0_12_3.tga or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.tiff =
-      (f.image_0_12_3.tiff or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    image_0_12_3.webp =
-      (f.image_0_12_3.webp or false) ||
-      (f.image_0_12_3.default or false) ||
-      (image_0_12_3.default or false);
-    jpeg_decoder_0_1_11.default = true;
-    num_iter_0_1_33.default = true;
-    num_rational_0_1_36.default = (f.num_rational_0_1_36.default or false);
-    num_traits_0_1_37.default = true;
-    png_0_6_2.default = true;
-    scoped_threadpool_0_1_7.default = true;
-  }) [ byteorder_1_0_0_features enum_primitive_0_1_1_features gif_0_9_1_features glob_0_2_11_features jpeg_decoder_0_1_11_features num_iter_0_1_33_features num_rational_0_1_36_features num_traits_0_1_37_features png_0_6_2_features scoped_threadpool_0_1_7_features ];
-  inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
-    features = mkFeatures (features.inflate_0_1_1 or {});
-  };
-  inflate_0_1_1_features = f: updateFeatures f ({
-    inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
-  }) [];
-  jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ {
-    dependencies = mapFeatures features ([ byteorder_1_0_0 ]
-      ++ (if features.jpeg_decoder_0_1_11.rayon or false then [ rayon_0_6_0 ] else []));
-    features = mkFeatures (features.jpeg_decoder_0_1_11 or {});
-  };
-  jpeg_decoder_0_1_11_features = f: updateFeatures f (rec {
-    byteorder_1_0_0.default = true;
-    jpeg_decoder_0_1_11.default = (f.jpeg_decoder_0_1_11.default or true);
-    jpeg_decoder_0_1_11.rayon =
-      (f.jpeg_decoder_0_1_11.rayon or false) ||
-      (f.jpeg_decoder_0_1_11.default or false) ||
-      (jpeg_decoder_0_1_11.default or false);
-    rayon_0_6_0.default = true;
-  }) [ byteorder_1_0_0_features rayon_0_6_0_features ];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  libc_0_2_21 = { features?(libc_0_2_21_features {}) }: libc_0_2_21_ {
-    features = mkFeatures (features.libc_0_2_21 or {});
-  };
-  libc_0_2_21_features = f: updateFeatures f (rec {
-    libc_0_2_21.default = (f.libc_0_2_21.default or true);
-    libc_0_2_21.use_std =
-      (f.libc_0_2_21.use_std or false) ||
-      (f.libc_0_2_21.default or false) ||
-      (libc_0_2_21.default or false);
-  }) [];
-  lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ {
-    features = mkFeatures (features.lzw_0_10_0 or {});
-  };
-  lzw_0_10_0_features = f: updateFeatures f (rec {
-    lzw_0_10_0.default = (f.lzw_0_10_0.default or true);
-    lzw_0_10_0.raii_no_panic =
-      (f.lzw_0_10_0.raii_no_panic or false) ||
-      (f.lzw_0_10_0.default or false) ||
-      (lzw_0_10_0.default or false);
-  }) [];
-  metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ {
-    dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]);
-  };
-  metadeps_1_1_1_features = f: updateFeatures f ({
-    error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false);
-    metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true);
-    pkg_config_0_3_9.default = true;
-    toml_0_2_1.default = (f.toml_0_2_1.default or false);
-  }) [ error_chain_0_7_2_features pkg_config_0_3_9_features toml_0_2_1_features ];
-  num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
-  };
-  num_integer_0_1_33_features = f: updateFeatures f ({
-    num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true);
-    num_traits_0_1_37.default = true;
-  }) [ num_traits_0_1_37_features ];
-  num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
-  };
-  num_iter_0_1_33_features = f: updateFeatures f ({
-    num_integer_0_1_33.default = true;
-    num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true);
-    num_traits_0_1_37.default = true;
-  }) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
-  num_rational_0_1_36 = { features?(num_rational_0_1_36_features {}) }: num_rational_0_1_36_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
-    features = mkFeatures (features.num_rational_0_1_36 or {});
-  };
-  num_rational_0_1_36_features = f: updateFeatures f (rec {
-    num_integer_0_1_33.default = true;
-    num_rational_0_1_36.bigint =
-      (f.num_rational_0_1_36.bigint or false) ||
-      (f.num_rational_0_1_36.default or false) ||
-      (num_rational_0_1_36.default or false);
-    num_rational_0_1_36.default = (f.num_rational_0_1_36.default or true);
-    num_rational_0_1_36.num-bigint =
-      (f.num_rational_0_1_36.num-bigint or false) ||
-      (f.num_rational_0_1_36.bigint or false) ||
-      (num_rational_0_1_36.bigint or false);
-    num_rational_0_1_36.rustc-serialize =
-      (f.num_rational_0_1_36.rustc-serialize or false) ||
-      (f.num_rational_0_1_36.default or false) ||
-      (num_rational_0_1_36.default or false);
-    num_traits_0_1_37.default = true;
-  }) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
-  num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
-  num_traits_0_1_37_features = f: updateFeatures f ({
-    num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
-  }) [];
-  num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ {
-    dependencies = mapFeatures features ([ libc_0_2_21 ]);
-  };
-  num_cpus_1_3_0_features = f: updateFeatures f ({
-    libc_0_2_21.default = true;
-    num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true);
-  }) [ libc_0_2_21_features ];
-  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 ({
-    pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
-  }) [];
-  png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_33 ]
-      ++ (if features.png_0_6_2.deflate or false then [ deflate_0_7_5 ] else []));
-    features = mkFeatures (features.png_0_6_2 or {});
-  };
-  png_0_6_2_features = f: updateFeatures f (rec {
-    bitflags_0_7_0.default = true;
-    deflate_0_7_5.default = true;
-    inflate_0_1_1.default = true;
-    num_iter_0_1_33.default = true;
-    png_0_6_2.default = (f.png_0_6_2.default or true);
-    png_0_6_2.deflate =
-      (f.png_0_6_2.deflate or false) ||
-      (f.png_0_6_2.png-encoding or false) ||
-      (png_0_6_2.png-encoding or false);
-    png_0_6_2.png-encoding =
-      (f.png_0_6_2.png-encoding or false) ||
-      (f.png_0_6_2.default or false) ||
-      (png_0_6_2.default or false);
-  }) [ bitflags_0_7_0_features deflate_0_7_5_features inflate_0_1_1_features num_iter_0_1_33_features ];
-  rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
-    dependencies = mapFeatures features ([ libc_0_2_21 ]);
-  };
-  rand_0_3_15_features = f: updateFeatures f ({
-    libc_0_2_21.default = true;
-    rand_0_3_15.default = (f.rand_0_3_15.default or true);
-  }) [ libc_0_2_21_features ];
-  rayon_0_6_0 = { features?(rayon_0_6_0_features {}) }: rayon_0_6_0_ {
-    dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]);
-    features = mkFeatures (features.rayon_0_6_0 or {});
-  };
-  rayon_0_6_0_features = f: updateFeatures f ({
-    deque_0_3_1.default = true;
-    libc_0_2_21.default = true;
-    num_cpus_1_3_0.default = true;
-    rand_0_3_15.default = true;
-    rayon_0_6_0.default = (f.rayon_0_6_0.default or true);
-  }) [ deque_0_3_1_features libc_0_2_21_features num_cpus_1_3_0_features rand_0_3_15_features ];
-  scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ {
-    features = mkFeatures (features.scoped_threadpool_0_1_7 or {});
-  };
-  scoped_threadpool_0_1_7_features = f: updateFeatures f ({
-    scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true);
-  }) [];
-  strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
-  strsim_0_6_0_features = f: updateFeatures f ({
-    strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
-  }) [];
-  term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ {
-    dependencies = mapFeatures features ([])
-      ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    features = mkFeatures (features.term_size_0_2_3 or {});
-  };
-  term_size_0_2_3_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_21.default = true;
-    term_size_0_2_3.clippy =
-      (f.term_size_0_2_3.clippy or false) ||
-      (f.term_size_0_2_3.lints or false) ||
-      (term_size_0_2_3.lints or false);
-    term_size_0_2_3.default = (f.term_size_0_2_3.default or true);
-    term_size_0_2_3.lints =
-      (f.term_size_0_2_3.lints or false) ||
-      (f.term_size_0_2_3.travis or false) ||
-      (term_size_0_2_3.travis or false);
-    term_size_0_2_3.nightly =
-      (f.term_size_0_2_3.nightly or false) ||
-      (f.term_size_0_2_3.lints or false) ||
-      (term_size_0_2_3.lints or false) ||
-      (f.term_size_0_2_3.travis or false) ||
-      (term_size_0_2_3.travis or false);
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ {
-    dependencies = mapFeatures features ([]);
-  };
-  toml_0_2_1_features = f: updateFeatures f (rec {
-    toml_0_2_1.default = (f.toml_0_2_1.default or true);
-    toml_0_2_1.rustc-serialize =
-      (f.toml_0_2_1.rustc-serialize or false) ||
-      (f.toml_0_2_1.default or false) ||
-      (toml_0_2_1.default or false);
-  }) [];
-  unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ {
-    features = mkFeatures (features.unicode_segmentation_1_1_0 or {});
-  };
-  unicode_segmentation_1_1_0_features = f: updateFeatures f ({
-    unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.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 ({
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
-  }) [];
-  vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.vec_map_0_7_0 or {});
-  };
-  vec_map_0_7_0_features = f: updateFeatures f (rec {
-    vec_map_0_7_0.default = (f.vec_map_0_7_0.default or true);
-    vec_map_0_7_0.serde =
-      (f.vec_map_0_7_0.serde or false) ||
-      (f.vec_map_0_7_0.eders or false) ||
-      (vec_map_0_7_0.eders or false);
-    vec_map_0_7_0.serde_derive =
-      (f.vec_map_0_7_0.serde_derive or false) ||
-      (f.vec_map_0_7_0.eders or false) ||
-      (vec_map_0_7_0.eders or false);
-  }) [];
-  wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ {
-    dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]);
-  };
-  wc_grab_0_3_0_features = f: updateFeatures f ({
-    clap_2_22_0.default = true;
-    dbus_0_5_2.default = true;
-    image_0_12_3.default = true;
-    wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true);
-  }) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f ({
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f ({
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
deleted file mode 100644
index 6ffc5779a0b6..000000000000
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ /dev/null
@@ -1,1479 +0,0 @@
-# Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.hostPlatform.parsed.kernel.name;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  wc_lock = f: wc_lock_0_2_1 { features = wc_lock_0_2_1_features { wc_lock_0_2_1 = f; }; };
-  ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.9.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ];
-    sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.2";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.7.0";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.8.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "0.5.3";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "1.1.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp";
-    inherit dependencies buildDependencies features;
-  };
-  cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1";
-    inherit dependencies buildDependencies features;
-  };
-  clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "clap";
-    version = "2.24.2";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
-    sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv";
-    inherit dependencies buildDependencies features;
-  };
-  coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "coco";
-    version = "0.1.1";
-    authors = [ "Stjepan Glavina <stjepang@gmail.com>" ];
-    sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94";
-    inherit dependencies buildDependencies features;
-  };
-  color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "color_quant";
-    version = "1.0.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj";
-    inherit dependencies buildDependencies features;
-  };
-  dbus_0_5_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dbus";
-    version = "0.5.4";
-    authors = [ "David Henningsson <diwic@ubuntu.com>" ];
-    sha256 = "0qr62splq38b8vfjvpcpk9ph21d63ya7vd2vifs5wc8jzwc309yn";
-    inherit dependencies buildDependencies features;
-  };
-  dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dlib";
-    version = "0.3.1";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
-    inherit dependencies buildDependencies features;
-  };
-  dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dtoa";
-    version = "0.4.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
-    inherit dependencies buildDependencies features;
-  };
-  either_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "either";
-    version = "1.2.0";
-    authors = [ "bluss" ];
-    sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp";
-    inherit dependencies buildDependencies features;
-  };
-  enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "enum_primitive";
-    version = "0.1.1";
-    authors = [ "Anders Kaseorg <andersk@mit.edu>" ];
-    sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y";
-    inherit dependencies buildDependencies features;
-  };
-  error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "error-chain";
-    version = "0.10.0";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
-    sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z";
-    inherit dependencies buildDependencies features;
-  };
-  flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "flate2";
-    version = "0.2.20";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl";
-    inherit dependencies buildDependencies features;
-  };
-  fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fs2";
-    version = "0.2.5";
-    authors = [ "Dan Burkert <dan@danburkert.com>" ];
-    sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790";
-    inherit dependencies buildDependencies features;
-  };
-  futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures";
-    version = "0.1.16";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b";
-    inherit dependencies buildDependencies features;
-  };
-  gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "gcc";
-    version = "0.3.50";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0";
-    inherit dependencies buildDependencies features;
-  };
-  gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "gif";
-    version = "0.9.2";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa";
-    inherit dependencies buildDependencies features;
-  };
-  glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "glob";
-    version = "0.2.11";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
-    inherit dependencies buildDependencies features;
-  };
-  image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "image";
-    version = "0.10.4";
-    authors = [ "ccgn" "bvssvni <bvssvni@gmail.com>" "nwin" "TyOverby <ty@pre-alpha.com>" ];
-    sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw";
-    libPath = "./src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "inflate";
-    version = "0.1.1";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h";
-    inherit dependencies buildDependencies features;
-  };
-  itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.3.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
-    inherit dependencies buildDependencies features;
-  };
-  jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "jpeg-decoder";
-    version = "0.1.13";
-    authors = [ "Ulf Nilsson <kaksmet@gmail.com>" ];
-    sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "0.2.8";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.23";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm";
-    inherit dependencies buildDependencies features;
-  };
-  libdbus_sys_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libdbus-sys";
-    version = "0.1.1";
-    authors = [ "David Henningsson <diwic@ubuntu.com>" ];
-    sha256 = "14kpislv2zazmgv5f8by4zkgkjxd0cwab8z6621kskjdwyir1wpy";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libloading";
-    version = "0.3.4";
-    authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
-    sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lzw";
-    version = "0.10.0";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb";
-    inherit dependencies buildDependencies features;
-  };
-  memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memmap";
-    version = "0.4.0";
-    authors = [ "Dan Burkert <dan@danburkert.com>" ];
-    sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll";
-    inherit dependencies buildDependencies features;
-  };
-  metadeps_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "metadeps";
-    version = "1.1.2";
-    authors = [ "Josh Triplett <josh@joshtriplett.org>" ];
-    sha256 = "00dpxjls9fq6fs5gr9v3hkqxmb1zwnhh8b56q3dnzghppjf3ivk3";
-    inherit dependencies buildDependencies features;
-  };
-  miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "miniz-sys";
-    version = "0.1.10";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln";
-    libPath = "lib.rs";
-    libName = "miniz_sys";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-bigint";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788";
-    inherit dependencies buildDependencies features;
-  };
-  num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-integer";
-    version = "0.1.35";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc";
-    inherit dependencies buildDependencies features;
-  };
-  num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-iter";
-    version = "0.1.34";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9";
-    inherit dependencies buildDependencies features;
-  };
-  num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-rational";
-    version = "0.1.39";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.1.37";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224";
-    inherit dependencies buildDependencies features;
-  };
-  num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num_cpus";
-    version = "1.6.2";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm";
-    inherit dependencies buildDependencies features;
-  };
-  phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_codegen";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj";
-    inherit dependencies buildDependencies features;
-  };
-  phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_generator";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g";
-    inherit dependencies buildDependencies features;
-  };
-  phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_shared";
-    version = "0.7.21";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
-    inherit dependencies buildDependencies features;
-  };
-  png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "png";
-    version = "0.5.2";
-    authors = [ "nwin <nwin@users.noreply.github.com>" ];
-    sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.15";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
-    inherit dependencies buildDependencies features;
-  };
-  rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rayon";
-    version = "0.8.2";
-    authors = [ "Niko Matsakis <niko@alum.mit.edu>" "Josh Stone <cuviper@gmail.com>" ];
-    sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8";
-    inherit dependencies buildDependencies features;
-  };
-  rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rayon-core";
-    version = "1.2.1";
-    authors = [ "Niko Matsakis <niko@alum.mit.edu>" "Josh Stone <cuviper@gmail.com>" ];
-    sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc-serialize";
-    version = "0.3.24";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc_version";
-    version = "0.1.7";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
-    inherit dependencies buildDependencies features;
-  };
-  scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scoped_threadpool";
-    version = "0.1.8";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6";
-    inherit dependencies buildDependencies features;
-  };
-  scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scopeguard";
-    version = "0.3.2";
-    authors = [ "bluss" ];
-    sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2";
-    inherit dependencies buildDependencies features;
-  };
-  semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver";
-    version = "0.1.20";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
-    inherit dependencies buildDependencies features;
-  };
-  serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "0.9.15";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
-    inherit dependencies buildDependencies features;
-  };
-  serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_json";
-    version = "0.9.10";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
-    sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
-    inherit dependencies buildDependencies features;
-  };
-  siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "siphasher";
-    version = "0.2.2";
-    authors = [ "Frank Denis <github@pureftpd.org>" ];
-    sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.6.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
-    inherit dependencies buildDependencies features;
-  };
-  target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "target_build_utils";
-    version = "0.3.1";
-    authors = [ "Simonas Kazlauskas <target_build_utils@kazlauskas.me>" ];
-    sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tempfile";
-    version = "2.1.5";
-    authors = [ "Steven Allen <steven@stebalien.com>" ];
-    sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "term_size";
-    version = "0.3.0";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" "Benjamin Sago <ogham@bsago.me>" ];
-    sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs";
-    inherit dependencies buildDependencies features;
-  };
-  toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml";
-    version = "0.2.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-segmentation";
-    version = "1.2.0";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "0yz43x7wrhr3n7a2zsinx3r60yxsdqicg8a5kycyyhdaq1zmiz1y";
-    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;
-  };
-  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;
-  };
-  way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "way-cooler-client-helpers";
-    version = "0.1.0";
-    authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
-    sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_client_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-client";
-    version = "0.9.6";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1908h6ilvq2cxph1lxv1vzrb3dcfx4x6pf6pszxwifsfqva8nm34";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_kbd_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-kbd";
-    version = "0.9.0";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1x0f7n79hjwf5fclf62fpzjp05xdzc93xw84zgyrn8f1hill3qhj";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_scanner_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-scanner";
-    version = "0.9.6";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "1w5cyc48g4x5w3rakb4sji5328rl5yph1abmjbh5h4slkm4n76g1";
-    inherit dependencies buildDependencies features;
-  };
-  wayland_sys_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wayland-sys";
-    version = "0.9.6";
-    authors = [ "Victor Berger <victor.berger@m4x.org>" ];
-    sha256 = "0izw50pmj1r10hmr29gi8ps01avs6zjwisywijlq7wr268h6yxcg";
-    inherit dependencies buildDependencies features;
-  };
-  wc_lock_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wc-lock";
-    version = "0.2.1";
-    authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
-    sha256 = "0ikmir7azihxiyzgb0wnvk81yinmn2l6k93bnb1qg4k704zcyq84";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "xml-rs";
-    version = "0.3.6";
-    authors = [ "Vladimir Matveev <vladimir.matweev@gmail.com>" ];
-    sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15";
-    libPath = "src/lib.rs";
-    libName = "xml";
-    crateBin = [ {  name = "xml-analyze";  path = "src/analyze.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
-  ansi_term_0_9_0_features = f: updateFeatures f ({
-    ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
-  }) [];
-  atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
-    dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-  };
-  atty_0_2_2_features = f: updateFeatures f ({
-    atty_0_2_2.default = (f.atty_0_2_2.default or true);
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_23.default = true;
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
-  bitflags_0_7_0_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
-  }) [];
-  bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ {
-    features = mkFeatures (features.bitflags_0_8_2 or {});
-  };
-  bitflags_0_8_2_features = f: updateFeatures f (rec {
-    bitflags_0_8_2.default = (f.bitflags_0_8_2.default or true);
-    bitflags_0_8_2.i128 =
-      (f.bitflags_0_8_2.i128 or false) ||
-      (f.bitflags_0_8_2.unstable or false) ||
-      (bitflags_0_8_2.unstable or false);
-  }) [];
-  byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ {
-    features = mkFeatures (features.byteorder_0_5_3 or {});
-  };
-  byteorder_0_5_3_features = f: updateFeatures f (rec {
-    byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true);
-    byteorder_0_5_3.std =
-      (f.byteorder_0_5_3.std or false) ||
-      (f.byteorder_0_5_3.default or false) ||
-      (byteorder_0_5_3.default or false);
-  }) [];
-  byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ {
-    features = mkFeatures (features.byteorder_1_1_0 or {});
-  };
-  byteorder_1_1_0_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true);
-    byteorder_1_1_0.std =
-      (f.byteorder_1_1_0.std or false) ||
-      (f.byteorder_1_1_0.default or false) ||
-      (byteorder_1_1_0.default or false);
-  }) [];
-  cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.cc_1_0_0 or {});
-  };
-  cc_1_0_0_features = f: updateFeatures f (rec {
-    cc_1_0_0.default = (f.cc_1_0_0.default or true);
-    cc_1_0_0.rayon =
-      (f.cc_1_0_0.rayon or false) ||
-      (f.cc_1_0_0.parallel or false) ||
-      (cc_1_0_0.parallel or false);
-  }) [];
-  clap_2_24_2 = { features?(clap_2_24_2_features {}) }: clap_2_24_2_ {
-    dependencies = mapFeatures features ([ bitflags_0_8_2 unicode_segmentation_1_2_0 unicode_width_0_1_4 vec_map_0_8_0 ]
-      ++ (if features.clap_2_24_2.ansi_term or false then [ ansi_term_0_9_0 ] else [])
-      ++ (if features.clap_2_24_2.atty or false then [ atty_0_2_2 ] else [])
-      ++ (if features.clap_2_24_2.strsim or false then [ strsim_0_6_0 ] else [])
-      ++ (if features.clap_2_24_2.term_size or false then [ term_size_0_3_0 ] else []));
-    features = mkFeatures (features.clap_2_24_2 or {});
-  };
-  clap_2_24_2_features = f: updateFeatures f (rec {
-    ansi_term_0_9_0.default = true;
-    atty_0_2_2.default = true;
-    bitflags_0_8_2.default = true;
-    clap_2_24_2.ansi_term =
-      (f.clap_2_24_2.ansi_term or false) ||
-      (f.clap_2_24_2.color or false) ||
-      (clap_2_24_2.color or false);
-    clap_2_24_2.atty =
-      (f.clap_2_24_2.atty or false) ||
-      (f.clap_2_24_2.color or false) ||
-      (clap_2_24_2.color or false);
-    clap_2_24_2.clippy =
-      (f.clap_2_24_2.clippy or false) ||
-      (f.clap_2_24_2.lints or false) ||
-      (clap_2_24_2.lints or false);
-    clap_2_24_2.color =
-      (f.clap_2_24_2.color or false) ||
-      (f.clap_2_24_2.default or false) ||
-      (clap_2_24_2.default or false);
-    clap_2_24_2.default = (f.clap_2_24_2.default or true);
-    clap_2_24_2.strsim =
-      (f.clap_2_24_2.strsim or false) ||
-      (f.clap_2_24_2.suggestions or false) ||
-      (clap_2_24_2.suggestions or false);
-    clap_2_24_2.suggestions =
-      (f.clap_2_24_2.suggestions or false) ||
-      (f.clap_2_24_2.default or false) ||
-      (clap_2_24_2.default or false);
-    clap_2_24_2.term_size =
-      (f.clap_2_24_2.term_size or false) ||
-      (f.clap_2_24_2.wrap_help or false) ||
-      (clap_2_24_2.wrap_help or false);
-    clap_2_24_2.wrap_help =
-      (f.clap_2_24_2.wrap_help or false) ||
-      (f.clap_2_24_2.default or false) ||
-      (clap_2_24_2.default or false);
-    clap_2_24_2.yaml-rust =
-      (f.clap_2_24_2.yaml-rust or false) ||
-      (f.clap_2_24_2.yaml or false) ||
-      (clap_2_24_2.yaml or false);
-    strsim_0_6_0.default = true;
-    term_size_0_3_0.default = true;
-    unicode_segmentation_1_2_0.default = true;
-    unicode_width_0_1_4.default = true;
-    vec_map_0_8_0.default = true;
-  }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_2_features strsim_0_6_0_features term_size_0_3_0_features unicode_segmentation_1_2_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ];
-  coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ {
-    dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
-    features = mkFeatures (features.coco_0_1_1 or {});
-  };
-  coco_0_1_1_features = f: updateFeatures f ({
-    coco_0_1_1.default = (f.coco_0_1_1.default or true);
-    either_1_2_0.default = true;
-    scopeguard_0_3_2.default = true;
-  }) [ either_1_2_0_features scopeguard_0_3_2_features ];
-  color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
-  color_quant_1_0_0_features = f: updateFeatures f ({
-    color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
-  }) [];
-  dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ {
-    dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]);
-    features = mkFeatures (features.dbus_0_5_4 or {});
-  };
-  dbus_0_5_4_features = f: updateFeatures f ({
-    dbus_0_5_4.default = (f.dbus_0_5_4.default or true);
-    libc_0_2_23.default = true;
-    libdbus_sys_0_1_1.default = true;
-  }) [ libc_0_2_23_features libdbus_sys_0_1_1_features ];
-  dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ {
-    dependencies = mapFeatures features ([ libloading_0_3_4 ]);
-    features = mkFeatures (features.dlib_0_3_1 or {});
-  };
-  dlib_0_3_1_features = f: updateFeatures f ({
-    dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
-    libloading_0_3_4.default = true;
-  }) [ libloading_0_3_4_features ];
-  dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {};
-  dtoa_0_4_1_features = f: updateFeatures f ({
-    dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true);
-  }) [];
-  either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
-    features = mkFeatures (features.either_1_2_0 or {});
-  };
-  either_1_2_0_features = f: updateFeatures f (rec {
-    either_1_2_0.default = (f.either_1_2_0.default or true);
-    either_1_2_0.use_std =
-      (f.either_1_2_0.use_std or false) ||
-      (f.either_1_2_0.default or false) ||
-      (either_1_2_0.default or false);
-  }) [];
-  enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
-  };
-  enum_primitive_0_1_1_features = f: updateFeatures f ({
-    enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
-    num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
-  }) [ num_traits_0_1_37_features ];
-  error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.error_chain_0_10_0 or {});
-  };
-  error_chain_0_10_0_features = f: updateFeatures f (rec {
-    error_chain_0_10_0.backtrace =
-      (f.error_chain_0_10_0.backtrace or false) ||
-      (f.error_chain_0_10_0.default or false) ||
-      (error_chain_0_10_0.default or false);
-    error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true);
-    error_chain_0_10_0.example_generated =
-      (f.error_chain_0_10_0.example_generated or false) ||
-      (f.error_chain_0_10_0.default or false) ||
-      (error_chain_0_10_0.default or false);
-  }) [];
-  flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ {
-    dependencies = mapFeatures features ([ libc_0_2_23 ]
-      ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else []));
-    features = mkFeatures (features.flate2_0_2_20 or {});
-  };
-  flate2_0_2_20_features = f: updateFeatures f (rec {
-    flate2_0_2_20.default = (f.flate2_0_2_20.default or true);
-    flate2_0_2_20.futures =
-      (f.flate2_0_2_20.futures or false) ||
-      (f.flate2_0_2_20.tokio or false) ||
-      (flate2_0_2_20.tokio or false);
-    flate2_0_2_20.libz-sys =
-      (f.flate2_0_2_20.libz-sys or false) ||
-      (f.flate2_0_2_20.zlib or false) ||
-      (flate2_0_2_20.zlib or false);
-    flate2_0_2_20.miniz-sys =
-      (f.flate2_0_2_20.miniz-sys or false) ||
-      (f.flate2_0_2_20.default or false) ||
-      (flate2_0_2_20.default or false);
-    flate2_0_2_20.tokio-io =
-      (f.flate2_0_2_20.tokio-io or false) ||
-      (f.flate2_0_2_20.tokio or false) ||
-      (flate2_0_2_20.tokio or false);
-    libc_0_2_23.default = true;
-    miniz_sys_0_1_10.default = true;
-  }) [ libc_0_2_23_features miniz_sys_0_1_10_features ];
-  fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ {
-    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
-  };
-  fs2_0_2_5_features = f: updateFeatures f ({
-    fs2_0_2_5.default = (f.fs2_0_2_5.default or true);
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_23.default = true;
-    winapi_0_2_8.default = true;
-  }) [ kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ];
-  futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ {
-    features = mkFeatures (features.futures_0_1_16 or {});
-  };
-  futures_0_1_16_features = f: updateFeatures f (rec {
-    futures_0_1_16.default = (f.futures_0_1_16.default or true);
-    futures_0_1_16.use_std =
-      (f.futures_0_1_16.use_std or false) ||
-      (f.futures_0_1_16.default or false) ||
-      (futures_0_1_16.default or false);
-    futures_0_1_16.with-deprecated =
-      (f.futures_0_1_16.with-deprecated or false) ||
-      (f.futures_0_1_16.default or false) ||
-      (futures_0_1_16.default or false);
-  }) [];
-  gcc_0_3_50 = { features?(gcc_0_3_50_features {}) }: gcc_0_3_50_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.gcc_0_3_50 or {});
-  };
-  gcc_0_3_50_features = f: updateFeatures f (rec {
-    gcc_0_3_50.default = (f.gcc_0_3_50.default or true);
-    gcc_0_3_50.rayon =
-      (f.gcc_0_3_50.rayon or false) ||
-      (f.gcc_0_3_50.parallel or false) ||
-      (gcc_0_3_50.parallel or false);
-  }) [];
-  gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ {
-    dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]);
-    features = mkFeatures (features.gif_0_9_2 or {});
-  };
-  gif_0_9_2_features = f: updateFeatures f (rec {
-    color_quant_1_0_0.default = true;
-    gif_0_9_2.default = (f.gif_0_9_2.default or true);
-    gif_0_9_2.libc =
-      (f.gif_0_9_2.libc or false) ||
-      (f.gif_0_9_2.c_api or false) ||
-      (gif_0_9_2.c_api or false);
-    gif_0_9_2.raii_no_panic =
-      (f.gif_0_9_2.raii_no_panic or false) ||
-      (f.gif_0_9_2.default or false) ||
-      (gif_0_9_2.default or false);
-    lzw_0_10_0.default = true;
-  }) [ color_quant_1_0_0_features lzw_0_10_0_features ];
-  glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
-  glob_0_2_11_features = f: updateFeatures f ({
-    glob_0_2_11.default = (f.glob_0_2_11.default or true);
-  }) [];
-  image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
-    dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_37 ]
-      ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else [])
-      ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else [])
-      ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else [])
-      ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else []));
-    features = mkFeatures (features.image_0_10_4 or {});
-  };
-  image_0_10_4_features = f: updateFeatures f (rec {
-    byteorder_0_5_3.default = true;
-    enum_primitive_0_1_1.default = true;
-    gif_0_9_2.default = true;
-    glob_0_2_11.default = true;
-    image_0_10_4.bmp =
-      (f.image_0_10_4.bmp or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false) ||
-      (f.image_0_10_4.ico or false) ||
-      (image_0_10_4.ico or false);
-    image_0_10_4.default = (f.image_0_10_4.default or true);
-    image_0_10_4.gif =
-      (f.image_0_10_4.gif or false) ||
-      (f.image_0_10_4.gif_codec or false) ||
-      (image_0_10_4.gif_codec or false);
-    image_0_10_4.gif_codec =
-      (f.image_0_10_4.gif_codec or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.hdr =
-      (f.image_0_10_4.hdr or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.ico =
-      (f.image_0_10_4.ico or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.jpeg =
-      (f.image_0_10_4.jpeg or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.jpeg-decoder =
-      (f.image_0_10_4.jpeg-decoder or false) ||
-      (f.image_0_10_4.jpeg or false) ||
-      (image_0_10_4.jpeg or false);
-    image_0_10_4.png =
-      (f.image_0_10_4.png or false) ||
-      (f.image_0_10_4.png_codec or false) ||
-      (image_0_10_4.png_codec or false);
-    image_0_10_4.png_codec =
-      (f.image_0_10_4.png_codec or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false) ||
-      (f.image_0_10_4.ico or false) ||
-      (image_0_10_4.ico or false);
-    image_0_10_4.ppm =
-      (f.image_0_10_4.ppm or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.scoped_threadpool =
-      (f.image_0_10_4.scoped_threadpool or false) ||
-      (f.image_0_10_4.hdr or false) ||
-      (image_0_10_4.hdr or false);
-    image_0_10_4.tga =
-      (f.image_0_10_4.tga or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.tiff =
-      (f.image_0_10_4.tiff or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    image_0_10_4.webp =
-      (f.image_0_10_4.webp or false) ||
-      (f.image_0_10_4.default or false) ||
-      (image_0_10_4.default or false);
-    jpeg_decoder_0_1_13.default = true;
-    num_iter_0_1_34.default = true;
-    num_rational_0_1_39.default = true;
-    num_traits_0_1_37.default = true;
-    png_0_5_2.default = true;
-    scoped_threadpool_0_1_8.default = true;
-  }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_37_features png_0_5_2_features scoped_threadpool_0_1_8_features ];
-  inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
-    features = mkFeatures (features.inflate_0_1_1 or {});
-  };
-  inflate_0_1_1_features = f: updateFeatures f ({
-    inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
-  }) [];
-  itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {};
-  itoa_0_3_1_features = f: updateFeatures f ({
-    itoa_0_3_1.default = (f.itoa_0_3_1.default or true);
-  }) [];
-  jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
-    dependencies = mapFeatures features ([ byteorder_1_1_0 ]
-      ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else []));
-    features = mkFeatures (features.jpeg_decoder_0_1_13 or {});
-  };
-  jpeg_decoder_0_1_13_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = true;
-    jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true);
-    jpeg_decoder_0_1_13.rayon =
-      (f.jpeg_decoder_0_1_13.rayon or false) ||
-      (f.jpeg_decoder_0_1_13.default or false) ||
-      (jpeg_decoder_0_1_13.default or false);
-    rayon_0_8_2.default = true;
-  }) [ byteorder_1_1_0_features rayon_0_8_2_features ];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_0_2_8 or {});
-  };
-  lazy_static_0_2_8_features = f: updateFeatures f (rec {
-    lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true);
-    lazy_static_0_2_8.nightly =
-      (f.lazy_static_0_2_8.nightly or false) ||
-      (f.lazy_static_0_2_8.spin_no_std or false) ||
-      (lazy_static_0_2_8.spin_no_std or false);
-    lazy_static_0_2_8.spin =
-      (f.lazy_static_0_2_8.spin or false) ||
-      (f.lazy_static_0_2_8.spin_no_std or false) ||
-      (lazy_static_0_2_8.spin_no_std or false);
-  }) [];
-  libc_0_2_23 = { features?(libc_0_2_23_features {}) }: libc_0_2_23_ {
-    features = mkFeatures (features.libc_0_2_23 or {});
-  };
-  libc_0_2_23_features = f: updateFeatures f (rec {
-    libc_0_2_23.default = (f.libc_0_2_23.default or true);
-    libc_0_2_23.use_std =
-      (f.libc_0_2_23.use_std or false) ||
-      (f.libc_0_2_23.default or false) ||
-      (libc_0_2_23.default or false);
-  }) [];
-  libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ {
-    buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);};
-  libdbus_sys_0_1_1_features = f: updateFeatures f ({
-    libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true);
-    metadeps_1_1_2.default = true;
-  }) [ metadeps_1_1_2_features ];
-  libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_8 ])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
-  };
-  libloading_0_3_4_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = true;
-    lazy_static_0_2_8.default = true;
-    libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
-    target_build_utils_0_3_1.default = true;
-    winapi_0_2_8.default = true;
-  }) [ lazy_static_0_2_8_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ {
-    features = mkFeatures (features.lzw_0_10_0 or {});
-  };
-  lzw_0_10_0_features = f: updateFeatures f (rec {
-    lzw_0_10_0.default = (f.lzw_0_10_0.default or true);
-    lzw_0_10_0.raii_no_panic =
-      (f.lzw_0_10_0.raii_no_panic or false) ||
-      (f.lzw_0_10_0.default or false) ||
-      (lzw_0_10_0.default or false);
-  }) [];
-  memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ {
-    dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
-  };
-  memmap_0_4_0_features = f: updateFeatures f ({
-    fs2_0_2_5.default = true;
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_23.default = true;
-    memmap_0_4_0.default = (f.memmap_0_4_0.default or true);
-    winapi_0_2_8.default = true;
-  }) [ fs2_0_2_5_features kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ];
-  metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ {
-    dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]);
-  };
-  metadeps_1_1_2_features = f: updateFeatures f ({
-    error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false);
-    metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true);
-    pkg_config_0_3_9.default = true;
-    toml_0_2_1.default = (f.toml_0_2_1.default or false);
-  }) [ error_chain_0_10_0_features pkg_config_0_3_9_features toml_0_2_1_features ];
-  miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ {
-    dependencies = mapFeatures features ([ libc_0_2_23 ]);
-    buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
-  };
-  miniz_sys_0_1_10_features = f: updateFeatures f ({
-    cc_1_0_0.default = true;
-    libc_0_2_23.default = true;
-    miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
-  }) [ libc_0_2_23_features cc_1_0_0_features ];
-  num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]
-      ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_15 ] else [])
-      ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else []));
-    features = mkFeatures (features.num_bigint_0_1_40 or {});
-  };
-  num_bigint_0_1_40_features = f: updateFeatures f (rec {
-    num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true);
-    num_bigint_0_1_40.rand =
-      (f.num_bigint_0_1_40.rand or false) ||
-      (f.num_bigint_0_1_40.default or false) ||
-      (num_bigint_0_1_40.default or false);
-    num_bigint_0_1_40.rustc-serialize =
-      (f.num_bigint_0_1_40.rustc-serialize or false) ||
-      (f.num_bigint_0_1_40.default or false) ||
-      (num_bigint_0_1_40.default or false);
-    num_integer_0_1_35.default = true;
-    num_traits_0_1_37.default = true;
-    rand_0_3_15.default = true;
-    rustc_serialize_0_3_24.default = true;
-  }) [ num_integer_0_1_35_features num_traits_0_1_37_features rand_0_3_15_features rustc_serialize_0_3_24_features ];
-  num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
-    dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
-  };
-  num_integer_0_1_35_features = f: updateFeatures f ({
-    num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
-    num_traits_0_1_37.default = true;
-  }) [ num_traits_0_1_37_features ];
-  num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]);
-  };
-  num_iter_0_1_34_features = f: updateFeatures f ({
-    num_integer_0_1_35.default = true;
-    num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
-    num_traits_0_1_37.default = true;
-  }) [ num_integer_0_1_35_features num_traits_0_1_37_features ];
-  num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]
-      ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else [])
-      ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else []));
-    features = mkFeatures (features.num_rational_0_1_39 or {});
-  };
-  num_rational_0_1_39_features = f: updateFeatures f (rec {
-    num_bigint_0_1_40.default = true;
-    num_integer_0_1_35.default = true;
-    num_rational_0_1_39.bigint =
-      (f.num_rational_0_1_39.bigint or false) ||
-      (f.num_rational_0_1_39.default or false) ||
-      (num_rational_0_1_39.default or false);
-    num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true);
-    num_rational_0_1_39.num-bigint =
-      (f.num_rational_0_1_39.num-bigint or false) ||
-      (f.num_rational_0_1_39.bigint or false) ||
-      (num_rational_0_1_39.bigint or false);
-    num_rational_0_1_39.rustc-serialize =
-      (f.num_rational_0_1_39.rustc-serialize or false) ||
-      (f.num_rational_0_1_39.default or false) ||
-      (num_rational_0_1_39.default or false);
-    num_traits_0_1_37.default = true;
-    rustc_serialize_0_3_24.default = true;
-  }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ];
-  num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
-  num_traits_0_1_37_features = f: updateFeatures f ({
-    num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
-  }) [];
-  num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ {
-    dependencies = mapFeatures features ([ libc_0_2_23 ]);
-  };
-  num_cpus_1_6_2_features = f: updateFeatures f ({
-    libc_0_2_23.default = true;
-    num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true);
-  }) [ libc_0_2_23_features ];
-  phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_21 ]);
-    features = mkFeatures (features.phf_0_7_21 or {});
-  };
-  phf_0_7_21_features = f: updateFeatures f (rec {
-    phf_0_7_21.default = (f.phf_0_7_21.default or true);
-    phf_shared_0_7_21.core =
-      (f.phf_shared_0_7_21.core or false) ||
-      (phf_0_7_21.core or false) ||
-      (f.phf_0_7_21.core or false);
-    phf_shared_0_7_21.default = true;
-    phf_shared_0_7_21.unicase =
-      (f.phf_shared_0_7_21.unicase or false) ||
-      (phf_0_7_21.unicase or false) ||
-      (f.phf_0_7_21.unicase or false);
-  }) [ phf_shared_0_7_21_features ];
-  phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
-  };
-  phf_codegen_0_7_21_features = f: updateFeatures f ({
-    phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
-    phf_generator_0_7_21.default = true;
-    phf_shared_0_7_21.default = true;
-  }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ];
-  phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]);
-  };
-  phf_generator_0_7_21_features = f: updateFeatures f ({
-    phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
-    phf_shared_0_7_21.default = true;
-    rand_0_3_15.default = true;
-  }) [ phf_shared_0_7_21_features rand_0_3_15_features ];
-  phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ {
-    dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
-    features = mkFeatures (features.phf_shared_0_7_21 or {});
-  };
-  phf_shared_0_7_21_features = f: updateFeatures f ({
-    phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
-    siphasher_0_2_2.default = true;
-  }) [ siphasher_0_2_2_features ];
-  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 ({
-    pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
-  }) [];
-  png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ]
-      ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else []));
-    features = mkFeatures (features.png_0_5_2 or {});
-  };
-  png_0_5_2_features = f: updateFeatures f (rec {
-    bitflags_0_7_0.default = true;
-    flate2_0_2_20.default = true;
-    inflate_0_1_1.default = true;
-    num_iter_0_1_34.default = true;
-    png_0_5_2.default = (f.png_0_5_2.default or true);
-    png_0_5_2.flate2 =
-      (f.png_0_5_2.flate2 or false) ||
-      (f.png_0_5_2.png-encoding or false) ||
-      (png_0_5_2.png-encoding or false);
-    png_0_5_2.png-encoding =
-      (f.png_0_5_2.png-encoding or false) ||
-      (f.png_0_5_2.default or false) ||
-      (png_0_5_2.default or false);
-  }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ];
-  rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
-    dependencies = mapFeatures features ([ libc_0_2_23 ]);
-  };
-  rand_0_3_15_features = f: updateFeatures f ({
-    libc_0_2_23.default = true;
-    rand_0_3_15.default = (f.rand_0_3_15.default or true);
-  }) [ libc_0_2_23_features ];
-  rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
-    dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
-  };
-  rayon_0_8_2_features = f: updateFeatures f ({
-    rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
-    rayon_core_1_2_1.default = true;
-  }) [ rayon_core_1_2_1_features ];
-  rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
-    dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]);
-  };
-  rayon_core_1_2_1_features = f: updateFeatures f ({
-    coco_0_1_1.default = true;
-    futures_0_1_16.default = true;
-    lazy_static_0_2_8.default = true;
-    libc_0_2_23.default = true;
-    num_cpus_1_6_2.default = true;
-    rand_0_3_15.default = true;
-    rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
-  }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ];
-  rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
-  rustc_serialize_0_3_24_features = f: updateFeatures f ({
-    rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
-  }) [];
-  rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ {
-    dependencies = mapFeatures features ([ semver_0_1_20 ]);
-  };
-  rustc_version_0_1_7_features = f: updateFeatures f ({
-    rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true);
-    semver_0_1_20.default = true;
-  }) [ semver_0_1_20_features ];
-  scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
-    features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
-  };
-  scoped_threadpool_0_1_8_features = f: updateFeatures f ({
-    scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
-  }) [];
-  scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
-    features = mkFeatures (features.scopeguard_0_3_2 or {});
-  };
-  scopeguard_0_3_2_features = f: updateFeatures f (rec {
-    scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true);
-    scopeguard_0_3_2.use_std =
-      (f.scopeguard_0_3_2.use_std or false) ||
-      (f.scopeguard_0_3_2.default or false) ||
-      (scopeguard_0_3_2.default or false);
-  }) [];
-  semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {};
-  semver_0_1_20_features = f: updateFeatures f ({
-    semver_0_1_20.default = (f.semver_0_1_20.default or true);
-  }) [];
-  serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_0_9_15 or {});
-  };
-  serde_0_9_15_features = f: updateFeatures f (rec {
-    serde_0_9_15.alloc =
-      (f.serde_0_9_15.alloc or false) ||
-      (f.serde_0_9_15.collections or false) ||
-      (serde_0_9_15.collections or false);
-    serde_0_9_15.default = (f.serde_0_9_15.default or true);
-    serde_0_9_15.serde_derive =
-      (f.serde_0_9_15.serde_derive or false) ||
-      (f.serde_0_9_15.derive or false) ||
-      (serde_0_9_15.derive or false) ||
-      (f.serde_0_9_15.playground or false) ||
-      (serde_0_9_15.playground or false);
-    serde_0_9_15.std =
-      (f.serde_0_9_15.std or false) ||
-      (f.serde_0_9_15.default or false) ||
-      (serde_0_9_15.default or false) ||
-      (f.serde_0_9_15.unstable-testing or false) ||
-      (serde_0_9_15.unstable-testing or false);
-    serde_0_9_15.unstable =
-      (f.serde_0_9_15.unstable or false) ||
-      (f.serde_0_9_15.alloc or false) ||
-      (serde_0_9_15.alloc or false) ||
-      (f.serde_0_9_15.unstable-testing or false) ||
-      (serde_0_9_15.unstable-testing or false);
-  }) [];
-  serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]);
-    features = mkFeatures (features.serde_json_0_9_10 or {});
-  };
-  serde_json_0_9_10_features = f: updateFeatures f (rec {
-    dtoa_0_4_1.default = true;
-    itoa_0_3_1.default = true;
-    num_traits_0_1_37.default = true;
-    serde_0_9_15.default = true;
-    serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true);
-    serde_json_0_9_10.linked-hash-map =
-      (f.serde_json_0_9_10.linked-hash-map or false) ||
-      (f.serde_json_0_9_10.preserve_order or false) ||
-      (serde_json_0_9_10.preserve_order or false);
-  }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_37_features serde_0_9_15_features ];
-  siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
-    dependencies = mapFeatures features ([]);
-  };
-  siphasher_0_2_2_features = f: updateFeatures f ({
-    siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
-  }) [];
-  strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
-  strsim_0_6_0_features = f: updateFeatures f ({
-    strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
-  }) [];
-  target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
-    dependencies = mapFeatures features ([ phf_0_7_21 ]
-      ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else []));
-    buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]);
-    features = mkFeatures (features.target_build_utils_0_3_1 or {});
-  };
-  target_build_utils_0_3_1_features = f: updateFeatures f (rec {
-    phf_0_7_21.default = true;
-    phf_codegen_0_7_21.default = true;
-    serde_json_0_9_10.default = true;
-    target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true);
-    target_build_utils_0_3_1.serde_json =
-      (f.target_build_utils_0_3_1.serde_json or false) ||
-      (f.target_build_utils_0_3_1.default or false) ||
-      (target_build_utils_0_3_1.default or false);
-  }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ];
-  tempfile_2_1_5 = { features?(tempfile_2_1_5_features {}) }: tempfile_2_1_5_ {
-    dependencies = mapFeatures features ([ rand_0_3_15 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_23 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]);
-  };
-  tempfile_2_1_5_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_23.default = true;
-    rand_0_3_15.default = true;
-    rustc_version_0_1_7.default = true;
-    tempfile_2_1_5.default = (f.tempfile_2_1_5.default or true);
-    winapi_0_2_8.default = true;
-  }) [ rand_0_3_15_features rustc_version_0_1_7_features libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ {
-    dependencies = mapFeatures features ([])
-      ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-    features = mkFeatures (features.term_size_0_3_0 or {});
-  };
-  term_size_0_3_0_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_23.default = true;
-    term_size_0_3_0.clippy =
-      (f.term_size_0_3_0.clippy or false) ||
-      (f.term_size_0_3_0.lints or false) ||
-      (term_size_0_3_0.lints or false);
-    term_size_0_3_0.default = (f.term_size_0_3_0.default or true);
-    term_size_0_3_0.lints =
-      (f.term_size_0_3_0.lints or false) ||
-      (f.term_size_0_3_0.travis or false) ||
-      (term_size_0_3_0.travis or false);
-    term_size_0_3_0.nightly =
-      (f.term_size_0_3_0.nightly or false) ||
-      (f.term_size_0_3_0.lints or false) ||
-      (term_size_0_3_0.lints or false) ||
-      (f.term_size_0_3_0.travis or false) ||
-      (term_size_0_3_0.travis or false);
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ {
-    dependencies = mapFeatures features ([]);
-  };
-  toml_0_2_1_features = f: updateFeatures f (rec {
-    toml_0_2_1.default = (f.toml_0_2_1.default or true);
-    toml_0_2_1.rustc-serialize =
-      (f.toml_0_2_1.rustc-serialize or false) ||
-      (f.toml_0_2_1.default or false) ||
-      (toml_0_2_1.default or false);
-  }) [];
-  unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ {
-    features = mkFeatures (features.unicode_segmentation_1_2_0 or {});
-  };
-  unicode_segmentation_1_2_0_features = f: updateFeatures f ({
-    unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.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 ({
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.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);
-  }) [];
-  way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
-    dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]);
-  };
-  way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
-    way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
-    wayland_client_0_9_6.cursor = true;
-    wayland_client_0_9_6.default = true;
-    wayland_client_0_9_6.dlopen = true;
-    wayland_sys_0_9_6.client = true;
-    wayland_sys_0_9_6.default = true;
-    wayland_sys_0_9_6.dlopen = true;
-  }) [ wayland_client_0_9_6_features wayland_sys_0_9_6_features ];
-  wayland_client_0_9_6 = { features?(wayland_client_0_9_6_features {}) }: wayland_client_0_9_6_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_9_6 ]);
-    buildDependencies = mapFeatures features ([ wayland_scanner_0_9_6 ]);
-    features = mkFeatures (features.wayland_client_0_9_6 or {});
-  };
-  wayland_client_0_9_6_features = f: updateFeatures f (rec {
-    bitflags_0_7_0.default = true;
-    libc_0_2_23.default = true;
-    wayland_client_0_9_6.cursor =
-      (f.wayland_client_0_9_6.cursor or false) ||
-      (f.wayland_client_0_9_6.default or false) ||
-      (wayland_client_0_9_6.default or false);
-    wayland_client_0_9_6.default = (f.wayland_client_0_9_6.default or true);
-    wayland_client_0_9_6.egl =
-      (f.wayland_client_0_9_6.egl or false) ||
-      (f.wayland_client_0_9_6.default or false) ||
-      (wayland_client_0_9_6.default or false);
-    wayland_scanner_0_9_6.default = true;
-    wayland_sys_0_9_6.client = true;
-    wayland_sys_0_9_6.cursor =
-      (f.wayland_sys_0_9_6.cursor or false) ||
-      (wayland_client_0_9_6.cursor or false) ||
-      (f.wayland_client_0_9_6.cursor or false);
-    wayland_sys_0_9_6.default = true;
-    wayland_sys_0_9_6.dlopen =
-      (f.wayland_sys_0_9_6.dlopen or false) ||
-      (wayland_client_0_9_6.dlopen or false) ||
-      (f.wayland_client_0_9_6.dlopen or false);
-    wayland_sys_0_9_6.egl =
-      (f.wayland_sys_0_9_6.egl or false) ||
-      (wayland_client_0_9_6.egl or false) ||
-      (f.wayland_client_0_9_6.egl or false);
-  }) [ bitflags_0_7_0_features libc_0_2_23_features wayland_sys_0_9_6_features wayland_scanner_0_9_6_features ];
-  wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]);
-  };
-  wayland_kbd_0_9_0_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = true;
-    dlib_0_3_1.default = true;
-    lazy_static_0_2_8.default = true;
-    memmap_0_4_0.default = true;
-    wayland_client_0_9_6.default = true;
-    wayland_kbd_0_9_0.default = (f.wayland_kbd_0_9_0.default or true);
-  }) [ bitflags_0_7_0_features dlib_0_3_1_features lazy_static_0_2_8_features memmap_0_4_0_features wayland_client_0_9_6_features ];
-  wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ {
-    dependencies = mapFeatures features ([ xml_rs_0_3_6 ]);
-  };
-  wayland_scanner_0_9_6_features = f: updateFeatures f ({
-    wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true);
-    xml_rs_0_3_6.default = true;
-  }) [ xml_rs_0_3_6_features ];
-  wayland_sys_0_9_6 = { features?(wayland_sys_0_9_6_features {}) }: wayland_sys_0_9_6_ {
-    dependencies = mapFeatures features ([ dlib_0_3_1 ]
-      ++ (if features.wayland_sys_0_9_6.lazy_static or false then [ lazy_static_0_2_8 ] else []));
-    features = mkFeatures (features.wayland_sys_0_9_6 or {});
-  };
-  wayland_sys_0_9_6_features = f: updateFeatures f (rec {
-    dlib_0_3_1.default = true;
-    dlib_0_3_1.dlopen =
-      (f.dlib_0_3_1.dlopen or false) ||
-      (wayland_sys_0_9_6.dlopen or false) ||
-      (f.wayland_sys_0_9_6.dlopen or false);
-    lazy_static_0_2_8.default = true;
-    wayland_sys_0_9_6.default = (f.wayland_sys_0_9_6.default or true);
-    wayland_sys_0_9_6.lazy_static =
-      (f.wayland_sys_0_9_6.lazy_static or false) ||
-      (f.wayland_sys_0_9_6.dlopen or false) ||
-      (wayland_sys_0_9_6.dlopen or false);
-    wayland_sys_0_9_6.libc =
-      (f.wayland_sys_0_9_6.libc or false) ||
-      (f.wayland_sys_0_9_6.server or false) ||
-      (wayland_sys_0_9_6.server or false);
-  }) [ dlib_0_3_1_features lazy_static_0_2_8_features ];
-  wc_lock_0_2_1 = { features?(wc_lock_0_2_1_features {}) }: wc_lock_0_2_1_ {
-    dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]);
-    buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]);
-  };
-  wc_lock_0_2_1_features = f: updateFeatures f ({
-    byteorder_0_5_3.default = true;
-    clap_2_24_2.default = true;
-    dbus_0_5_4.default = true;
-    gcc_0_3_50.default = true;
-    image_0_10_4.default = true;
-    libc_0_2_23.default = true;
-    rand_0_3_15.default = true;
-    tempfile_2_1_5.default = true;
-    way_cooler_client_helpers_0_1_0.default = true;
-    wayland_client_0_9_6.cursor = true;
-    wayland_client_0_9_6.default = true;
-    wayland_client_0_9_6.dlopen = true;
-    wayland_kbd_0_9_0.default = true;
-    wayland_scanner_0_9_6.default = true;
-    wayland_sys_0_9_6.client = true;
-    wayland_sys_0_9_6.default = true;
-    wayland_sys_0_9_6.dlopen = true;
-    wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true);
-  }) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f ({
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f ({
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-  xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ {
-    dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
-  };
-  xml_rs_0_3_6_features = f: updateFeatures f ({
-    bitflags_0_7_0.default = true;
-    xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true);
-  }) [ bitflags_0_7_0_features ];
-}
diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix
deleted file mode 100644
index 03d0b3023f71..000000000000
--- a/pkgs/applications/window-managers/way-cooler/wlc.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
-, libX11, dbus, wayland-protocols, libdrm, mesa
-, libpthreadstubs, libXdmcp, libXext, libXfixes
-, withOptionalPackages ? true, zlib, valgrind, doxygen
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wlc";
-  version = "0.0.11";
-
-  src = fetchFromGitHub {
-    owner = "Cloudef";
-    repo = "wlc";
-    rev = "v${version}";
-    fetchSubmodules = true;
-    sha256 = "1qnak907gjd35hq4b0rrhgb7kz5iwnirh8yk372yzxpgk7dq0gz9";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [
-    wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL
-    libX11 libXfixes dbus wayland-protocols
-    libpthreadstubs libXdmcp libXext libdrm mesa ]
-    ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
-
-  doCheck = true;
-  checkTarget = "test";
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "A library for making a simple Wayland compositor";
-    homepage    = https://github.com/Cloudef/wlc;
-    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 ef9ebc140504..c8ab3a1a75bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21994,7 +21994,8 @@ in
     pythonPackages = python3Packages;
   };
 
-  way-cooler = callPackage ../applications/window-managers/way-cooler {};
+  way-cooler = throw ("way-cooler is abandoned by its author: " +
+    "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html");
 
   waypipe = callPackage ../applications/networking/remote/waypipe { };
 

From e14d19be43a5a576b1e72260a3697aa38f7d96d1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Jan 2020 11:40:37 -0500
Subject: [PATCH 165/755] linux: 4.14.165 -> 4.14.166

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 9bfa07ec460d..71b626479ba2 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.165";
+  version = "4.14.166";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1iw8w3kfm8cs97imc6zz2wqzq9bhhlygcg7r8qslwks0hqivbbmh";
+    sha256 = "003wax7dsahlv1iv9yqhkjbxx20crmwyd9464cx974i03a0vzclb";
   };
 } // (args.argsOverride or {}))

From cac9f210cf80b23b6a4d746be3f3ab6cac926637 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Jan 2020 11:41:12 -0500
Subject: [PATCH 166/755] linux: 4.19.96 -> 4.19.97

---
 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 6f4594763c88..fc0caad7406f 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.96";
+  version = "4.19.97";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0k8xcdmc3jffk4y7vxnwvrjnrzhjcw07ikp5a2c4zhbvpbax3h93";
+    sha256 = "1nln2ksfm0ddkqdmhvxwzqq96av1myx89kr1wxs54m2yw0la7clg";
   };
 } // (args.argsOverride or {}))

From 64d20fe9cc302db901bcc2da9794b11787e6b6cc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Jan 2020 11:41:44 -0500
Subject: [PATCH 167/755] linux: 5.4.12 -> 5.4.13

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 76f7430f1044..9b1ebeeb4898 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.12";
+  version = "5.4.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1yyh934ifzwgqlpd8wy50z9d68hla5arvy50pi6c499dsnicghyr";
+    sha256 = "1mva73ywb2r5lrmzp5m7hyy0zpgxdg91nw42c1z1sz3ydpcjkys9";
   };
 } // (args.argsOverride or {}))

From ba059b9a23dc18954b648b244197feb80fb0cbb1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Jan 2020 11:51:07 -0500
Subject: [PATCH 168/755] vivaldi: 2.10.1745.26-1 -> 2.10.1745.27-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 3784ff6b00f1..6825d2af64f9 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.10.1745.26-1";
+  version = "2.10.1745.27-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "0zl5sqa60x9yg7acp6vxgnmfzz27v849mlpp1wgnwh019fx3wf53";
+    sha256 = "1z9biiycxcxyw7i1lqhvk8092hqvidaipkfdvkz632vxcg33jz4q";
   };
 
   unpackPhase = ''

From aa92851f778defaf0a3eba297a3946134e3738dc Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 18 Jan 2020 12:09:42 +0000
Subject: [PATCH 169/755] pythonPackages.sysv_ipc: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix
new file mode 100644
index 000000000000..37853980f43a
--- /dev/null
+++ b/pkgs/development/python-modules/sysv_ipc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "sysv_ipc";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p5lx3yz4p40rfb453m80a4hh8341yp4dki2nhhxz7bq2zfi1zwf";
+  };
+
+  meta = with stdenv.lib; {
+    description = "SysV IPC primitives (semaphores, shared memory and message queues)";
+    license = licenses.bsd3;
+    homepage = http://semanchuk.com/philip/sysv_ipc/;
+    maintainers = with maintainers; [ ris ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d402e3f07a44..d1e854b007ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5465,6 +5465,8 @@ in {
     inherit (pkgs) pkgconfig systemd;
   };
 
+  sysv_ipc = callPackage ../development/python-modules/sysv_ipc { };
+
   tabulate = callPackage ../development/python-modules/tabulate { };
 
   tadasets = callPackage ../development/python-modules/tadasets { };

From 33a12a2d2241dddc15242abb117ef4922fce8370 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 12 Dec 2019 10:11:07 +0100
Subject: [PATCH 170/755] ikiwiki: 3.20170111 -> 3.20190228

---
 pkgs/applications/misc/ikiwiki/default.nix    | 13 ++++---
 .../misc/ikiwiki/remove-markdown-tests.patch  | 37 +++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 957f0f7f68bb..8b908f1f9cf2 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20170111";
+  version = "3.20190228";
 
   lib = stdenv.lib;
 in
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.xz";
-    sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz";
+    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
+    sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
   };
 
   buildInputs = [ which ]
@@ -44,7 +44,11 @@ stdenv.mkDerivation {
     ++ lib.optionals subversionSupport [subversion]
     ++ lib.optionals mercurialSupport [mercurial];
 
-  patchPhase = ''
+  # A few markdown tests fail, but this is expected when using Text::Markdown
+  # instead of Text::Markdown::Discount.
+  patches = [ ./remove-markdown-tests.patch ];
+
+  postPatch = ''
     sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man
     sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
     sed -i /ENV{PATH}/d ikiwiki.in
@@ -83,6 +87,5 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];
-    broken = true; # https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/
   };
 }
diff --git a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
new file mode 100644
index 000000000000..c981857a248b
--- /dev/null
+++ b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/t/mdwn.t b/t/mdwn.t
+index ca3180139..d64750403 100755
+--- a/t/mdwn.t
++++ b/t/mdwn.t
+@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
+ 	"C. S. Lewis wrote books\n"),
+ 	"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
+ 
+-$config{mdwn_alpha_lists} = 1;
+-like(IkiWiki::htmlize("foo", "foo", "mdwn",
+-	"A. One\n".
+-	"B. Two\n"),
+-	qr{<ol\W}, "alphalist can be enabled");
+-
+ $config{mdwn_alpha_lists} = 0;
+ like(IkiWiki::htmlize("foo", "foo", "mdwn",
+ 	"A. One\n".
+ 	"B. Two\n"),
+ 	qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
+ 
+-like(IkiWiki::htmlize("foo", "foo", "mdwn",
+-	"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
+-	qr{<p>This works<sup\W}, "footnotes on by default");
+-
+ $config{mdwn_footnotes} = 0;
+ like(IkiWiki::htmlize("foo", "foo", "mdwn",
+ 	"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
+ 	qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
+ 
+-$config{mdwn_footnotes} = 1;
+-like(IkiWiki::htmlize("foo", "foo", "mdwn",
+-	"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
+-	qr{<p>This works<sup\W}, "footnotes can be enabled");
+-
+ SKIP: {
+ 	skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
+ 		unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};

From e5d007e86a5226aa6a10690e85c0e423ad6f547c Mon Sep 17 00:00:00 2001
From: Eric Norris <erictnorris@gmail.com>
Date: Sat, 18 Jan 2020 15:59:30 -0500
Subject: [PATCH 171/755] rpm: fix helper script paths

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

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index ae0259e65fcd..05d293b5bf12 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -50,6 +50,11 @@ stdenv.mkDerivation rec {
       sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/"
     done
 
+    # Avoid helper scripts pointing to absolute paths
+    for tool in find-provides find-requires; do
+      sed -i $out/lib/rpm/$tool -e "s#/usr/lib/rpm/#$out/lib/rpm/#"
+    done
+
     # symlinks produced by build are incorrect
     ln -sf $out/bin/{rpm,rpmquery}
     ln -sf $out/bin/{rpm,rpmverify}

From 479bc9d9e61b70cf827b2ce16a095a1e46ad87c5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jan 2020 16:20:00 -0500
Subject: [PATCH 172/755] ocamlPackages.sedlex_2: init at 2.1

---
 pkgs/development/ocaml-modules/sedlex/2.nix | 69 +++++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix           |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/sedlex/2.nix

diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix
new file mode 100644
index 000000000000..09390a27343f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sedlex/2.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, fetchFromGitHub
+, fetchurl
+, ocaml
+, dune
+, findlib
+, gen
+, ppx_tools_versioned
+, ocaml-migrate-parsetree
+, uchar
+}:
+
+if stdenv.lib.versionOlder ocaml.version "4.02.3"
+then throw "sedlex is not available for OCaml ${ocaml.version}"
+else
+
+let
+  DerivedCoreProperties = fetchurl {
+    url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt";
+    sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6";
+  };
+  DerivedGeneralCategory = fetchurl {
+    url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt";
+    sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q";
+  };
+  PropList = fetchurl {
+    url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt";
+    sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-sedlex-${version}";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-community";
+    repo = "sedlex";
+    rev = "v${version}";
+    sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
+  };
+
+  buildInputs = [ ocaml findlib dune ppx_tools_versioned ocaml-migrate-parsetree ];
+
+  propagatedBuildInputs = [ gen uchar ];
+
+  preBuild = ''
+    ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt
+    ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt
+    ln -s ${PropList} src/generator/data/PropList.txt
+  '';
+
+  buildFlags = [ "build" ];
+
+  installPhase = ''
+    make INSTALL_ARGS="--prefix=$out --libdir=$OCAMLFIND_DESTDIR" install
+  '';
+
+  createFindlibDestdir = true;
+
+  dontStrip = true;
+
+  meta = {
+    homepage = https://github.com/ocaml-community/sedlex;
+    description = "An OCaml lexer generator for Unicode";
+    license = stdenv.lib.licenses.mit;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4d956c494c05..96603d3a495a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -839,6 +839,8 @@ let
 
     sedlex = callPackage ../development/ocaml-modules/sedlex { };
 
+    sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { };
+
     sodium = callPackage ../development/ocaml-modules/sodium { };
 
     spelll = callPackage ../development/ocaml-modules/spelll { };

From f19f50b6ea90a6b594576d3ef1d9077f0e15565d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jan 2020 16:21:00 -0500
Subject: [PATCH 173/755] flow: 0.114.0 -> 0.116.1

---
 pkgs/development/tools/analysis/flow/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index ecd8f3a17ec9..2d2c3b0274d7 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.114.0";
+  version = "0.116.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1dkp3v898b5vd0a9fl5xknwbbqv23v0icqml8ypyhzrv6wz5qiy3";
+    sha256 = "19j2zw8ajky04d2ayfzj99yz805igip1ql3i4v7bblamc8sk38cn";
   };
 
   installPhase = ''
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
     install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
   '';
 
-  buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
+  buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
   patches = [
-    # Fix List.compare labeled argument. Remove when https://github.com/facebook/flow/pull/8191 is merged
+    # Fix List.compare labeled argument. Remove with the next release
     (fetchpatch {
-      url = "https://github.com/facebook/flow/commit/1625664ec7290d4128587d96cb878571751f8881.patch";
-      sha256 = "18fan0d2xa6z4ilbr7ha3vhnfqlr2s6mb02sgpv8ala99b0mcgmn";
+      url = "https://github.com/facebook/flow/commit/d061b38042327d8241fb6dec7c8307c86b2f23d6.patch";
+      sha256 = "1rmkb1zldgm2y2n32nm2xd8c7wk3hccsbljjz6bm6a0yixa6w77l";
     })
   ];
 

From 42fd1d07270fdca3c64e4d63fcb1fa701e12d22d Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Sat, 18 Jan 2020 17:37:28 +0100
Subject: [PATCH 174/755] ghc: 8.8.2-rc1 -> 8.8.2

https://www.haskell.org/ghc/blog/20200116-ghc-8.8.2-released.html
---
 pkgs/development/compilers/ghc/8.8.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index 4ed99a8402aa..b0eef9ef924d 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -86,12 +86,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.8.1.20191211";
+  version = "8.8.2";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/8.8.2-rc1/ghc-${version}-src.tar.xz";
-    sha256 = "1gl4fzakjbhd94v1saxmr9sfzgk22m1b95jq51rxm93b2g4cixl4";
+    url = "https://downloads.haskell.org/ghc/8.8.2/ghc-${version}-src.tar.xz";
+    sha256 = "02qa6wgjpxgakg7hv4zfdlrx9k7zxa5i02wnr6y9fsv8j16sbkh1";
   };
 
   enableParallelBuilding = true;

From 5d1fda386e3692c7ea73c13ca1261ae46746a259 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 18 Jan 2020 16:41:57 -0500
Subject: [PATCH 175/755] zoneminder: Fix installation location for cgi-bin
 (#76855)

Before this change, the build would duplicate the prefix in the
installation location for cgi-bin stuff:
-- Installing: /nix/store/skg6b81hikd3fvvdf62xbkm6gsbid41a-zoneminder-1.32.3/nix/store/skg6b81hikd3fvvdf62xbkm6gsbid41a-zoneminder-1.32.3/libexec/zoneminder/cgi-bin/zms
---
 pkgs/servers/zoneminder/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 2dcaf44010e7..e536ea0373cf 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -162,6 +162,10 @@ in stdenv.mkDerivation rec {
     "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
     "-DZM_WEB_USER=${user}"
     "-DZM_WEB_GROUP=${user}"
+
+    # Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
+    # But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
+    "-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
   ];
 
   passthru = { inherit dirName; };

From 1db77e58d0aa239df6208d6233685dda96dc2286 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 1 Jan 2020 17:11:53 +0100
Subject: [PATCH 176/755] wlroots: 0.8.1 -> 0.9.0

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.9.0
---
 pkgs/development/libraries/wlroots/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a567e66285cc..d1dcb5993ab0 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,24 +6,15 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm";
+    sha256 = "0sifcrqs82kg9zxqnlr1pl4cw9v9qqakyg3rkysywc9svbikd1g3";
   };
 
-  patches = [
-    # add missing header that changed in mesa-19.2.2
-    # https://github.com/swaywm/wlroots/issues/1862
-    (fetchpatch {
-      url = "https://github.com/swaywm/wlroots/commit/d113e48a2a32542fe6e12f1759f07888364609bf.diff";
-      sha256 = "1h09j1gmnzlz4py92a92chgy8xzsd8h8xn5irq9s2hq4cla66h87";
-    })
-  ];
-
   # $out for the library and $examples for the example programs (in examples):
   outputs = [ "out" "examples" ];
 

From 1835ac1d791e83852e7e3551ba6f8d7c992cca53 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 10 Jan 2020 18:14:10 +0100
Subject: [PATCH 177/755] tdesktop: 1.8.15 -> 1.9.3

The GYP build is now deprecated [0].
This results in a large number of changes and many custom Nix patches
aren't required anymore (and probably haven't been required for quite
some time now, the derivation got a bit outdated...).

A lot of the changes in this commit are based on the changes of the
Arch package [1][2] (which our package is based upon).

Rough overview of the changes:
- gcc9 -> ninja (optional but let's follow Arch here)
- Dropped GYP, only CMake now
  - But: Python is still required
- fetchFromGitHub -> fetchurl (optional?)
- Apply all Arch patches and remove old patches
  - Requires one new patch for range-v3
- New dependencies: enchant2, lz4, xxHash
  - TODO: Plus a few new dependencies that shouldn't be required
- Cleanup: Irrelevant flags (e.g. GYP_DEFINES) and patches (e.g. sed)
  - Simplifies quite a few things :)
- Some additional documentation and TODOs

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>

[0]: https://github.com/telegramdesktop/tdesktop/issues/7001
[1]: https://git.archlinux.org/svntogit/community.git/commit/?id=23eff2b1ef7435441e93120618ca899f0b0e7e61
[2]: https://git.archlinux.org/svntogit/community.git/commit/?id=6a19e949724b2e2bfcdcf2081111ecd46108e449
---
 .../telegram/tdesktop/default.nix             | 138 +++++++-----------
 1 file changed, 49 insertions(+), 89 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index e57ff881af34..bec2f7505266 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,79 +1,74 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
-, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9
-, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
+{ mkDerivation, lib, fetchurl, fetchsvn
+, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
+, qtbase, qtimageformats, gtk3, libappindicator-gtk3, enchant2, lz4, xxHash
 , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+# TODO: Shouldn't be required:
+, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
+, xdg_utils
 }:
 
 with lib;
 
+# Main reference:
+# - This package is based on the Arch package:
+#   https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
+# Other references that could be useful (but we should try to stick to Arch):
+# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD
+# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template
+
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.8.15";
+  version = "1.9.3";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
   # Telegram-Desktop with submodules
-  src = fetchFromGitHub {
-    owner = "telegramdesktop";
-    repo = "tdesktop";
-    rev = "v${version}";
-    sha256 = "03173y2nlkf757llgpia8p2dkkwsjra7b6qm5nhmkcwcm8kmsvyy";
-    fetchSubmodules = true;
+  src = fetchurl {
+    url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
+    sha256 = "1fx7v7j7iw4iywdbl89c5f1y74via61a0k20zrgjv5a0j4v6g76a";
   };
 
   # Arch patches (svn export telegram-desktop/trunk)
   archPatches = fetchsvn {
     url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    rev = "512849";
-    sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls";
-  };
-  privateHeadersPatch = fetchpatch {
-    url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
-    sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v";
+    rev = "549803";
+    sha256 = "1py2a25wgpvx0n4kz383fj0jav1qdm8wqx5bdaygg6296r294czj";
   };
 
   # Note: It would be best if someone could get as many patches upstream as
   # possible (we currently depend a lot on custom patches...).
   patches = [
-    "${archPatches}/tdesktop.patch"
-    "${archPatches}/no-gtk2.patch"
-    "${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
-    "${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
-    # "${archPatches}/Revert-Change-some-private-header-includes.patch"
-    # "${archPatches}/Use-system-wide-font.patch"
+    "${archPatches}/0001-Dynamic-linking-system-libs.patch"
+    "${archPatches}/0002-Dynamic-linking-system-qt.patch"
+    "${archPatches}/0004-gtk3.patch"
+    "${archPatches}/0005-Use-system-wide-fonts.patch"
+    "${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
   ];
 
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
       --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
-      --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+    substituteInPlace cmake/external/ranges/CMakeLists.txt \
+      --replace "/usr/include" "${range-v3}/include"
   '';
 
   # We want to run wrapProgram manually (with additional parameters)
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
-  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ];
+  nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];
 
   buildInputs = [
-    qtbase qtimageformats gtk3 libappindicator-gtk3
+    qtbase qtimageformats gtk3 libappindicator-gtk3 enchant2 lz4 xxHash
     dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
+    # TODO: Shouldn't be required:
+    pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
   ];
 
   enableParallelBuilding = true;
 
-  GYP_DEFINES = concatStringsSep "," [
-    "TDESKTOP_DISABLE_CRASH_REPORTS"
-    "TDESKTOP_DISABLE_AUTOUPDATE"
-    "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
-  ];
-
   NIX_CFLAGS_COMPILE = [
-    "-DTDESKTOP_DISABLE_CRASH_REPORTS"
-    "-DTDESKTOP_DISABLE_AUTOUPDATE"
-    "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
     "-I${minizip}/include/minizip"
     # See Telegram/gyp/qt.gypi
     "-I${getDev qtbase}/mkspecs/linux-g++"
@@ -87,64 +82,29 @@ mkDerivation rec {
     ]) [ "QtCore" "QtGui" "QtDBus" ];
   CPPFLAGS = NIX_CFLAGS_COMPILE;
 
-  preConfigure = ''
-    # Patches to revert:
-    patch -R -Np1 -i "${privateHeadersPatch}"
-
-    # Patches to apply:
-    pushd "Telegram/ThirdParty/libtgvoip"
-    patch -Np1 -i "${archPatches}/libtgvoip.patch"
-    popd
-
-    # disable static-qt for rlottie
-    sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
-
-    sed -i Telegram/gyp/telegram/linux.gypi \
-      -e 's,/usr,/does-not-exist,g' \
-      -e 's,appindicator-0.1,appindicator3-0.1,g' \
-      -e 's,-flto,,g'
-
-    sed -i Telegram/gyp/modules/qt.gypi \
-      -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
-      -e 's,\d+",\d+" | head -n1,g'
-    sed -i Telegram/gyp/modules/qt_moc.gypi \
-      -e "s,/usr/bin/moc,moc,g"
-    sed -i Telegram/gyp/modules/qt_rcc.gypi \
-      -e "s,/usr/bin/rcc,rcc,g"
-
-    # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out
-    sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \
-      -e "/-msse2/d"
-
-    gyp \
-      -Dapi_id=17349 \
-      -Dapi_hash=344583e45741c457fe1862106095a5eb \
-      -Dbuild_defines=${GYP_DEFINES} \
-      -Gconfig=Release \
-      --depth=Telegram/gyp \
-      --generator-output=../.. \
-      -Goutput_dir=out \
-      --format=cmake \
-      Telegram/gyp/Telegram.gyp
-
-    cd out/Release
-
-    NUM=$((`wc -l < CMakeLists.txt` - 2))
-    sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt
-
-    export ASM=$(type -p gcc)
-  '';
-
-  cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ];
+  cmakeFlags = [
+    #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs
+    "-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271
+    "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
+    "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
+    "-DDESKTOP_APP_USE_SYSTEM_LIBS=ON"
+    "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
+    "-Ddisable_autoupdate=ON"
+    "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
+    "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
+    #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
+  ];
 
   installPhase = ''
-    install -Dm755 Telegram $out/bin/telegram-desktop
+    install -Dm755 bin/Telegram $out/bin/telegram-desktop
+
+    mkdir -p $out/share/{kservices5,applications,metainfo}
+    sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol"
+    install -m444 "../lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
+    install -m644 "../lib/xdg/telegramdesktop.appdata.xml" "$out/share/metainfo/telegramdesktop.metainfo.xml"
 
-    mkdir -p $out/share/applications $out/share/kde4/services
-    install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
-    sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
     for icon_size in 16 32 48 64 128 256 512; do
-      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png"
+      install -Dm644 "../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png"
     done
   '';
 

From 5679caf3ef5d8029f8e20952254efabb706f9ead Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 19 Jan 2020 08:28:52 +1000
Subject: [PATCH 178/755] fuse-overlayfs: 0.7.4 -> 0.7.5

---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index fc174b12f100..8287a84d30d8 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "02286q4lc1paq735qmn5nyz31g1lwrkcnjkp05fdzcxf60h8paxk";
+    sha256 = "1xsdn16n867c7af3j02z7nxh1i71wi0g4zspnrgz1qmpxdw4aays";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From bbc144aa215ad56e1267da59cfef3ad544e419e7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 19 Jan 2020 09:14:17 +1000
Subject: [PATCH 179/755] dive: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 2113e319f19a..6c4d91bac78f 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dive";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "wagoodman";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bqmrva7rx6al50fmy4gvf853csascc5mj6ihgg7ydsy0d99j5qn";
+    sha256 = "1dqaqzmb74kf6q70wxfbsrbbfmxl82rj7r5kpsg5znm99filk3ny";
   };
 
-  modSha256 = "0hb7bq8v6xr8xqni1iv3zkqdnknfy539sm0vxqal1mhvs5yg06m0";
+  modSha256 = "1y8mqxlzbizra2m9aayp6w07s39gddvm5igdaw9kwxwjwvd1dbfc";
 
   nativeBuildInputs = [ pkg-config ];
 

From c6022f7abf6375c0284072a1a9f30463ce505d4f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 20:26:45 -0500
Subject: [PATCH 180/755] nixos/gnome3: add gnome-shell to systemd.packages

This actually gets added via xdg.portal having gnome-shell.
However, that could change and it still for sure should be here.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 60b9a7eed869..ba9906072b3f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -249,11 +249,17 @@ in
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.telepathy.enable = mkDefault true;
 
-      systemd.packages = with pkgs.gnome3; [ vino gnome-session ];
+      systemd.packages = with pkgs.gnome3; [
+        gnome-session
+        gnome-shell
+        vino
+      ];
 
       services.avahi.enable = mkDefault true;
 
-      xdg.portal.extraPortals = [ pkgs.gnome3.gnome-shell ];
+      xdg.portal.extraPortals = [
+        pkgs.gnome3.gnome-shell
+      ];
 
       services.geoclue2.enable = mkDefault true;
       services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent

From 7867005552c6815ff34e8a641e1e91b2ac0f7935 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jan 2020 21:21:21 -0500
Subject: [PATCH 181/755] pg_checksums: init at 1.0

---
 .../tools/database/pg_checksums/default.nix   | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/tools/database/pg_checksums/default.nix

diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix
new file mode 100644
index 000000000000..f440e550a897
--- /dev/null
+++ b/pkgs/development/tools/database/pg_checksums/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "pg_checksums";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "credativ";
+    repo = pname;
+    rev = version;
+    sha256 = "0xc2bwp55xjnnf45lc60ldxpb5jfyi1bgfkv3nxrymcswh8yfidj";
+  };
+
+  nativeBuildInputs = [ libxslt.bin ];
+
+  buildInputs = [ postgresql ];
+
+  buildFlags = [ "all" "man" ];
+
+  preConfigure = ''
+    substituteInPlace doc/stylesheet-man.xsl \
+      --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
+  '';
+
+  installPhase = ''
+    install -Dm755 -t $out/bin pg_checksums
+    install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters";
+    homepage = "https://github.com/credativ/pg_checksums";
+    maintainers = [ maintainers.marsam ];
+    platforms = postgresql.meta.platforms;
+    license = licenses.postgresql;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e9cd87561b..ec21cb75b45d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5699,6 +5699,8 @@ in
 
   peco = callPackage ../tools/text/peco { };
 
+  pg_checksums = callPackage ../development/tools/database/pg_checksums { };
+
   pg_flame = callPackage ../tools/misc/pg_flame { };
 
   pg_top = callPackage ../tools/misc/pg_top { };

From b85c3aea65cec4eed4742994e77a24bfe4182321 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:18:30 -0500
Subject: [PATCH 182/755] nixpkgs-github-update: slowness

---
 .../lib/nixpkgs_github_update/github_latest_version.ex      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
index ad7f96d6b2a6..5333ad154f5b 100644
--- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
@@ -21,11 +21,11 @@ defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
   end
 
   defp get_token do
-    String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
+    System.get_env("OAUTH_TOKEN")
   end
 
-  defp put_token(headers, token) when is_list(token) do
-    Map.put_new(headers, 'Authorization', 'token #{token}')
+  defp put_token(headers, token) when token != nil do
+    Map.put_new(headers, 'Authorization', 'token #{String.to_charlist(token)}')
   end
 
   defp put_token(headers, _), do: headers

From 6a3c1882527b22f767f5336126bbcac234f0ad43 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:21:18 -0500
Subject: [PATCH 183/755] pantheon.elementary-terminal: 5.5.0 -> 5.5.1

https://github.com/elementary/terminal/releases/tag/5.5.1
---
 pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index bbb3ee59596d..27bcb21a006e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
-  version = "5.5.0";
+  version = "5.5.1";
 
   repoName = "terminal";
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "1wna3kcg621qjyvg70dzk4lfq8si2snnlm9fnl5gj0w6b707gz2x";
+    sha256 = "1b8fzs9s7djhwp02l3fwjpwxylklpbnw7x46mv7c8ksbp0m75iyj";
   };
 
   passthru = {

From 312f643a3a650e15dbb75a4c1a7a8b0eedbc6003 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:21:49 -0500
Subject: [PATCH 184/755] pantheon.switchboard: 2.3.7 -> 2.3.8

https://github.com/elementary/switchboard/releases/tag/2.3.8
---
 pkgs/desktops/pantheon/apps/switchboard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 03e6ef999eb0..28ec4e65f52d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
-  version = "2.3.7";
+  version = "2.3.8";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "160aar5dqd019vn28cm0d0ijj1i6mwpqkl7a1l4lpasw12drxwxz";
+    sha256 = "1y254irl07fp70228zm268w20zd7risz0sk9i9wz59yynxwjshbx";
   };
 
   passthru = {

From 6198a0e119061f91f8501b840fd22062934e9c46 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:22:26 -0500
Subject: [PATCH 185/755] pantheon.elementary-icon-theme: 5.1.0 -> 5.2.0

https://github.com/elementary/icons/releases/tag/5.2.0
---
 .../pantheon/artwork/elementary-icon-theme/default.nix    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 9943415a4573..291977349bd1 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -6,11 +6,13 @@
 , ninja
 , hicolor-icon-theme
 , gtk3
+, inkscape
+, xorg
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-icon-theme";
-  version = "5.1.0";
+  version = "5.2.0";
 
   repoName = "icons";
 
@@ -18,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "1yrf92ysjh1yfm42wznlw0lh9zsm5whghwzx3b3wcdkwdhkdg24z";
+    sha256 = "1irkjj8xfpgkl5p56xhqa3w2s98b8lav7d1lxxrabdi87cjv3n33";
   };
 
   passthru = {
@@ -29,9 +31,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gtk3
+    inkscape
     meson
     ninja
     python3
+    xorg.xcursorgen
   ];
 
   propagatedBuildInputs = [

From 1e9a4da5b195eff6134b03a2eed8fee7dab075bd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:23:11 -0500
Subject: [PATCH 186/755] pantheon.elementary-default-settings: 5.1.1 -> 5.1.2

https://github.com/elementary/default-settings/releases/tag/5.1.2
---
 .../pantheon/desktop/elementary-default-settings/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index e601c99108b3..be97c5903eb3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-default-settings";
-  version = "5.1.1";
+  version = "5.1.2";
 
   repoName = "default-settings";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "10sdy8v34y6bgb3mabwy7k3b5dbqrnab504dvhashpfxr9n9xncy";
+    sha256 = "00z31alwn2skhksrhp2jk75f6jlaipzk91hclx7na4gbcyrw7ahw";
   };
 
   passthru = {

From bea1a232c615aba177e0ef56600d5f847ad3bbd9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 21:23:51 -0500
Subject: [PATCH 187/755] pantheon.wingpanel-indicator-session: 2.2.6 -> 2.2.7

https://github.com/elementary/wingpanel-indicator-session/releases/tag/2.2.7
---
 .../pantheon/desktop/wingpanel-indicators/session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 72f94252cca9..af6155037efb 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-session";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0pzknbm0hg4kf2izfg1mcmyildfzwyq1hh0xhlq16gsmakq4ld26";
+    sha256 = "0qgb225ldg3qax370z3wvijxmm4bjfqds3r9aqqhlq30599xjhsb";
   };
 
   passthru = {

From 115e7e56e56ed0bfaf397b16171804db0496ba3f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 18 Jan 2020 22:34:07 -0500
Subject: [PATCH 188/755] motion: 4.2.2 -> 4.3.0

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

diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 684390d3c5c7..dafc6abdb0a3 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "motion";
-  version = "4.2.2";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner  = "Motion-Project";
     repo   = "motion";
-    rev    = "release-${version}";
-    sha256 = "05c1gx75xy2hw49x6vkydvwxbr80kipsc3nr906k3hq8735svx6f";
+    rev    = "Release-${version}";
+    sha256 = "08mm7ajgs0qnrydywxxyzcll09z80crjnjkjnckdi6ljsj6s96j8";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From e2c11ad3c068744f4549ecc29aa39e937b24bd98 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 24 Nov 2019 20:53:31 -0800
Subject: [PATCH 189/755] nixos/kubernetes: allow configuring cfssl API server
 SANs

---
 nixos/modules/services/cluster/kubernetes/pki.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix
index 733479e24c97..4275563f1a36 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -20,6 +20,7 @@ let
         size = 2048;
     };
     CN = top.masterAddress;
+    hosts = cfg.cfsslAPIExtraSANs;
   });
 
   cfsslAPITokenBaseName = "apitoken.secret";
@@ -66,6 +67,15 @@ in
       type = bool;
     };
 
+    cfsslAPIExtraSANs = mkOption {
+      description = ''
+        Extra x509 Subject Alternative Names to be added to the cfssl API webserver TLS cert.
+      '';
+      default = [];
+      example = [ "subdomain.example.com" ];
+      type = listOf str;
+    };
+
     genCfsslAPIToken = mkOption {
       description = ''
         Whether to automatically generate cfssl API-token secret,

From bac3e6841bcc5a260d35edfbe4591f255c0827c6 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 19 Jan 2020 10:09:12 +0100
Subject: [PATCH 190/755] nixos/unclutter: fix old typo

---
 nixos/modules/services/x11/unclutter.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 2478aaabb799..c0868604a688 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -32,7 +32,7 @@ in {
       default = 1;
     };
 
-    threeshold = mkOption {
+    threshold = mkOption {
       description = "Minimum number of pixels considered cursor movement";
       type = types.int;
       default = 1;
@@ -72,6 +72,11 @@ in {
     };
   };
 
+  imports = [
+    (mkRenamedOptionModule [ "services" "unclutter" "threeshold" ]
+                           [ "services"  "unclutter" "threshold" ])
+  ];
+
   meta.maintainers = with lib.maintainers; [ rnhmjoj ];
 
 }

From fc408d55e6346fb27ab89050689603c3b401c1ba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 19 Jan 2020 04:20:00 -0500
Subject: [PATCH 191/755] sewer: 0.7.3 -> 0.7.9

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

diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix
index c93aa987ece4..a659c635d174 100644
--- a/pkgs/tools/admin/sewer/default.nix
+++ b/pkgs/tools/admin/sewer/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sewer";
-  version = "0.7.3";
+  version = "0.7.9";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "12z4xvblis4xcmm2zbq4dkhjx5lsmcxx80gik2g1pqd2809rxsmy";
+    sha256 = "c083223d8aa66d4fc6801452d291a98540d1ee41557ce3e1754c62e73f7c9738";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ];

From 30a79026092b7aebfbefc42fd8af49e7b0416785 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 19 Jan 2020 04:20:00 -0500
Subject: [PATCH 192/755] sewer: enable on darwin

---
 pkgs/tools/admin/sewer/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix
index a659c635d174..776ba89e48ce 100644
--- a/pkgs/tools/admin/sewer/default.nix
+++ b/pkgs/tools/admin/sewer/default.nix
@@ -16,6 +16,5 @@ python3Packages.buildPythonApplication rec {
     description = "ACME client";
     license = licenses.mit;
     maintainers = with maintainers; [ kevincox ];
-    platforms = platforms.linux;
   };
 }

From 2a6b2342df8122d0e0fcdcdfe81e1f309d8fd46b Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Sun, 19 Jan 2020 10:27:27 +0100
Subject: [PATCH 193/755] captive-browser: runs on all platforms

---
 .../networking/browsers/captive-browser/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix
index e7bec997119e..88bd32da8f16 100644
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/pkgs/applications/networking/browsers/captive-browser/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
     description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
     homepage = https://blog.filippo.io/captive-browser;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ volth ];
   };
 }

From b334b46c6ad93f188ed0aa1c069fd87c6b8cf222 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 19 Jan 2020 11:33:10 +0200
Subject: [PATCH 194/755] oil: 0.7.pre9 -> 0.7.pre11

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

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 13b36bf54ad8..81c862843948 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.7.pre9";
+  version = "0.7.pre11";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "1j17yxpjqv37vbl3qhnwl3gdmb33n9c6g6byxcc8mhbvbw91zi5i";
+    sha256 = "0885cw07gkaggd5cvl58v6kw1z6la2xgdh1s88y0dynx95qv4i4c";
   };
 
   postPatch = ''

From 85fbe4b318a5e9ef3618930d878636f91742b993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 19 Jan 2020 12:41:36 +0100
Subject: [PATCH 195/755] pythonPackages.pypandoc: add sternenseemann to
 maintainers

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

diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index fc5263d81096..41576c5ad1fc 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Thin wrapper for pandoc";
     homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
-    maintainers = with maintainers; [ bennofs ];
+    maintainers = with maintainers; [ sternenseemann bennofs ];
   };
 }

From ebb3fa0f7c7365038a7393e6a5c90ea8e2614e13 Mon Sep 17 00:00:00 2001
From: Matthias Wimmer <m@tthias.eu>
Date: Sun, 19 Jan 2020 14:39:40 +0100
Subject: [PATCH 196/755] rosegarden: add alsaLib as a dependency

Without ALSA rosegarden will be built without MIDI support.

Fixes #77988
---
 pkgs/applications/audio/rosegarden/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 7c4cefb6ba4b..aaceab6dc084 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook
-, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2
+, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib
 , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
 
 stdenv.mkDerivation (rec {
@@ -30,6 +30,7 @@ stdenv.mkDerivation (rec {
     libsndfile
     lirc
     qtbase
+    alsaLib
   ];
 
   enableParallelBuilding = true;

From b7be10eead5663c8ea4d420597cf7e94739c2907 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 14 Jan 2020 00:48:11 +0100
Subject: [PATCH 197/755] distrho: 2018-04-16 -> unstable-2019-10-09

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

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 0d2858713eba..53d5330fb741 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -9,13 +9,13 @@ let
               else "linux";
 in stdenv.mkDerivation rec {
   pname = "distrho-ports";
-  version = "2018-04-16";
+  version = "unstable-2019-10-09";
 
   src = fetchFromGitHub {
     owner = "DISTRHO";
     repo = "DISTRHO-Ports";
-    rev = version;
-    sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v";
+    rev = "7e62235e809e59770d0d91d2c48c3f50ce7c027a";
+    sha256 = "10hpsjcmk0cgcsic9r1wxyja9x6q9wb8w8254dlrnzyswl54r1f8";
   };
 
   configurePhase = ''

From 0977ca4c2d9571cce326ced206b40a23066186da Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 14 Jan 2020 00:59:29 +0100
Subject: [PATCH 198/755] noise-repellent: unstable-2018-12-29 -> 0.1.5

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

diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix
index 146e13f34de1..bc5b35396e23 100644
--- a/pkgs/applications/audio/noise-repellent/default.nix
+++ b/pkgs/applications/audio/noise-repellent/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "noise-repellent";
-  version = "unstable-2018-12-29";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "lucianodato";
     repo = pname;
-    rev = "9efdd0b41ec184a792087c87cbf5382f455e33ec";
-    sha256 = "0pn9cxapfvb5l62q86bchyfll1290vi0rhrzarb1jpc4ix7kz53c";
+    rev = version;
+    sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl";
     fetchSubmodules = true;
   };
 

From 76ab11518d867597956bfe758b96b011ce63eb26 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 19 Jan 2020 17:18:34 +0000
Subject: [PATCH 199/755] treewide: Remove myself from maintainers on some
 packages (#78027)

---
 pkgs/applications/misc/qolibri/default.nix                 | 2 +-
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
 pkgs/applications/video/mpv/default.nix                    | 2 +-
 pkgs/development/interpreters/quickjs/default.nix          | 2 +-
 pkgs/misc/scream-receivers/default.nix                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index b7c137258fd9..c96fbab4d812 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -23,7 +23,7 @@ mkDerivation {
     homepage = https://github.com/ludios/qolibri;
     description = "EPWING reader for viewing Japanese dictionaries";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ivan ];
+    maintainers = with maintainers; [ ];
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index bbfce71a115c..b8160a682e64 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -61,7 +61,7 @@ mkChromiumDerivation (base: rec {
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ bendlas ivan thefloweringash ];
+    maintainers = with maintainers; [ bendlas thefloweringash ];
     license = if enableWideVine then licenses.unfree else licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index c333790d6a67..0ea042c13140 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -234,7 +234,7 @@ in stdenv.mkDerivation rec {
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = https://mpv.io;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ma27 tadeokondrak ];
+    maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
     platforms = platforms.darwin ++ platforms.linux;
 
     longDescription = ''
diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix
index e7f01856ef59..b1d03252d7ef 100644
--- a/pkgs/development/interpreters/quickjs/default.nix
+++ b/pkgs/development/interpreters/quickjs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A small and embeddable Javascript engine";
     homepage = "https://bellard.org/quickjs/";
-    maintainers = with maintainers; [ stesie ivan ];
+    maintainers = with maintainers; [ stesie ];
     platforms = platforms.linux;
     license = licenses.mit;
   };
diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix
index 2ca00ccc9cea..ed988a099da9 100644
--- a/pkgs/misc/scream-receivers/default.nix
+++ b/pkgs/misc/scream-receivers/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/duncanthrax/scream";
     license = licenses.mspl;
     platforms = platforms.linux;
-    maintainers = [ maintainers.ivan ];
+    maintainers = with maintainers; [ ];
   };
 }

From 3017d813df94ec30537eca48ef57f33dcf07b207 Mon Sep 17 00:00:00 2001
From: Jean-Marie Gaillourdet <jm@gaillourdet.net>
Date: Sun, 19 Jan 2020 19:02:55 +0100
Subject: [PATCH 200/755] scala_2_11: move text files from $out to appropriate
 subdirs

Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
---
 pkgs/development/compilers/scala/2.11.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index a1f803b67193..db1a8f4edcad 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     rm "bin/"*.bat
     mv * $out
 
+    # put docs in correct subdirectory
+    mkdir -p $out/share/doc
+    mv $out/doc $out/share/doc/${name}
+    mv $out/man $out/share/man
+
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p \
         --prefix PATH ":" ${coreutils}/bin \

From 8b7c59bab0e99f7aa00c44cd18f44badbe4f8a2e Mon Sep 17 00:00:00 2001
From: Jean-Marie Gaillourdet <jm@gaillourdet.net>
Date: Sun, 19 Jan 2020 19:12:42 +0100
Subject: [PATCH 201/755] scala_2_12: move text files from $out to appropriate
 subdirs

Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
---
 pkgs/development/compilers/scala/2.12.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix
index 9e11daced4a9..3f61669b938d 100644
--- a/pkgs/development/compilers/scala/2.12.nix
+++ b/pkgs/development/compilers/scala/2.12.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     # put docs in correct subdirectory
     mkdir -p $out/share/doc
     mv $out/doc $out/share/doc/scala
+    mv $out/{LICENSE,NOTICE} $out/share/doc/scala
 
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p \

From 254045fde6d08424adf52cfb39268b3b7bc3b5c2 Mon Sep 17 00:00:00 2001
From: Jean-Marie Gaillourdet <jm@gaillourdet.net>
Date: Sun, 19 Jan 2020 19:13:06 +0100
Subject: [PATCH 202/755] scala: move text files from $out to appropriate
 subdirs

Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
---
 pkgs/development/compilers/scala/2.13.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix
index 6bba11af9d46..b140d4e2a2db 100644
--- a/pkgs/development/compilers/scala/2.13.nix
+++ b/pkgs/development/compilers/scala/2.13.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     # put docs in correct subdirectory
     mkdir -p $out/share/doc
     mv $out/doc $out/share/doc/scala
+    mv $out/{LICENSE,NOTICE} $out/share/doc/scala
 
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p \

From 6795a4002c1508db2ee23a8d35117a09673c06dd Mon Sep 17 00:00:00 2001
From: Eric Culp <eculperic@gmail.com>
Date: Sun, 19 Jan 2020 10:33:46 -0800
Subject: [PATCH 203/755] test-driver.py: Use /tmp/shared for copy_from_vm

The docstring says it uses a directory shared among all vms, although
that doesn't seem necessary for the functionality. However, it does need
to be consistent between the guest and host.
---
 nixos/lib/test-driver/test-driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index d5212413284a..faa861c2f21c 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -576,7 +576,7 @@ class Machine:
         vm_src = pathlib.Path(source)
         with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
             shared_temp = pathlib.Path(shared_td)
-            vm_shared_temp = pathlib.Path("/tmp/xchg") / shared_temp.name
+            vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name
             vm_intermediate = vm_shared_temp / vm_src.name
             intermediate = shared_temp / vm_src.name
             # Copy the file to the shared directory inside VM

From 13555cb1ceb50c14841b1daf4e4a92b1eca4f5fb Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Tue, 14 Jan 2020 22:01:57 +0000
Subject: [PATCH 204/755] syslinux: 2015-11-09 -> 2019-02-07

---
 pkgs/os-specific/linux/syslinux/default.nix   | 32 ++++----
 .../linux/syslinux/perl-deps.patch            | 81 -------------------
 2 files changed, 18 insertions(+), 95 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/syslinux/perl-deps.patch

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 8631ddf01d08..ed901b21ac11 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }:
+{ stdenv, fetchFromRepoOrCz, fetchurl, nasm, perl, python3, libuuid, mtools, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "syslinux-2015-11-09";
+  name = "syslinux-2019-02-07";
 
-  src = fetchFromGitHub {
-    owner = "geneC";
+  # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run.
+  # Same issue here https://www.syslinux.org/archives/2019-February/026330.html
+  src = fetchFromRepoOrCz {
     repo = "syslinux";
-    rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f";
-    sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
+    rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7";
+    sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w";
   };
 
   patches = let
@@ -15,12 +16,13 @@ stdenv.mkDerivation {
       "https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/"
       + patchName;
   in [
-    ./perl-deps.patch
     (fetchurl {
-      # ldlinux.elf: Not enough room for program headers, try linking with -N
-      name = "not-enough-room.patch";
-      url = mkURL "a556ad7" "0014_fix_ftbfs_no_dynamic_linker.patch";
-      sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw";
+      url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch";
+      sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni";
+    })
+    (fetchurl {
+      url = mkURL "477e56d2" "0005-gnu-efi-version-compatibility.patch";
+      sha256 = "041568b4abb79wynyps1n04lg4fr26rc3sbjncz99pp0mbz0ajlm";
     })
     (fetchurl {
       # mbr.bin: too big (452 > 440)
@@ -33,20 +35,22 @@ stdenv.mkDerivation {
       url = mkURL "012e1dd312eb" "0017-single-load-segment.patch";
       sha256 = "0azqzicsjw47b9ppyikhzaqmjl4lrvkxris1356bkmgcaiv6d98b";
     })
+    (fetchurl {
+      url = mkURL "26f0e7b2" "0018-prevent-pow-optimization.patch";
+      sha256 = "1c8g0jz5yj9a0rsmryx9vdjsw4hw8mjfcg05c9pmyjg85w3dfp3m";
+    })
   ];
 
   postPatch = ''
     substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
-    substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
     substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl)
-    substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
 
     # fix tests
     substituteInPlace tests/unittest/include/unittest/unittest.h \
       --replace /usr/include/ ""
   '';
 
-  nativeBuildInputs = [ nasm perl python ];
+  nativeBuildInputs = [ nasm perl python3 ];
   buildInputs = [ libuuid makeWrapper ];
 
   enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
diff --git a/pkgs/os-specific/linux/syslinux/perl-deps.patch b/pkgs/os-specific/linux/syslinux/perl-deps.patch
deleted file mode 100644
index 82c9820809e1..000000000000
--- a/pkgs/os-specific/linux/syslinux/perl-deps.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-http://git.ipxe.org/ipxe.git/commitdiff/719b498
-
-diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios
---- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios	2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios	2010-08-06 23:32:57.000000000 +0200
-@@ -24,11 +24,11 @@
- 
- # Padding rules
- #
--PAD_rom		= $(PADIMG) --blksize=512 --byte=0xff $@
-+PAD_rom		= $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
- PAD_hrom	= $(PAD_rom)
- PAD_xrom	= $(PAD_rom)
--PAD_dsk		= $(PADIMG) --blksize=512 $@
--PAD_hd		= $(PADIMG) --blksize=32768 $@
-+PAD_dsk		= $(PERL) $(PADIMG) --blksize=512 $@
-+PAD_hd		= $(PERL) $(PADIMG) --blksize=32768 $@
- 
- # rule to make a non-emulation ISO boot image
- NON_AUTO_MEDIA	+= iso
-diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile
---- syslinux-4.02-orig/gpxe/src/Makefile	2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02/gpxe/src/Makefile	2010-08-06 23:31:15.000000000 +0200
-@@ -31,12 +31,12 @@
- OBJCOPY		:= $(CROSS_COMPILE)objcopy
- NM		:= $(CROSS_COMPILE)nm
- OBJDUMP		:= $(CROSS_COMPILE)objdump
--PARSEROM	:= $(PERL) ./util/parserom.pl
--MAKEROM		:= $(PERL) ./util/makerom.pl
--SYMCHECK	:= $(PERL) ./util/symcheck.pl
--SORTOBJDUMP	:= $(PERL) ./util/sortobjdump.pl
--PADIMG		:= $(PERL) ./util/padimg.pl
--LICENCE		:= $(PERL) ./util/licence.pl
-+PARSEROM	:= ./util/parserom.pl
-+MAKEROM		:= ./util/makerom.pl
-+SYMCHECK	:= ./util/symcheck.pl
-+SORTOBJDUMP	:= ./util/sortobjdump.pl
-+PADIMG		:= ./util/padimg.pl
-+LICENCE		:= ./util/licence.pl
- NRV2B		:= ./util/nrv2b
- ZBIN		:= ./util/zbin
- ELF2EFI32	:= ./util/elf2efi32
-diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping
---- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping	2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02/gpxe/src/Makefile.housekeeping	2010-08-06 23:31:49.000000000 +0200
-@@ -456,7 +456,7 @@
- 		 '\n$(2) : $$($(4)_DEPS)\n' \
- 		 '\nTAGS : $$($(4)_DEPS)\n' \
- 		>> $(2)
--	@$(PARSEROM) $(1) >> $(2)
-+	@$(PERL) $(PARSEROM) $(1) >> $(2)
- 
- endef
- 
-@@ -657,7 +657,7 @@
- 	$(QM)$(ECHO) "  [LD] $@"
- 	$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
- 		-Map $(BIN)/$*.tmp.map
--	$(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
-+	$(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
- 
- # Keep intermediate object file (useful for debugging)
- .PRECIOUS : $(BIN)/%.tmp
-@@ -714,7 +714,7 @@
- 		echo "files are missing a licence declaration:" ;\
- 		echo $(call unlicensed_deps_list,$<);\
- 		exit 1,\
--		$(LICENCE) $(call licence_list,$<))
-+		$(PERL) $(LICENCE) $(call licence_list,$<))
- 
- # Extract compression information from intermediate object file
- #
-@@ -941,7 +941,7 @@
- CLEANUP	+= $(BIN)/symtab
- 
- symcheck : $(SYMTAB)
--	$(SYMCHECK) $<
-+	$(PERL) $(SYMCHECK) $<
- 
- endif # defined(BIN)
- 

From 8c6b1c3eaaa8b555bddaced3ab6f02695bef1541 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 19 Jan 2020 21:19:35 +0100
Subject: [PATCH 205/755] nixos/buildkite-agent: add "user" option

This allows buildkite-agent to run as another user.

It'll still run builds from /var/lib/buildkite-agent and setup things in
there.
---
 .../buildkite-agent.nix                       | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 3c9c92bf0527..49160b43c619 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -29,6 +29,8 @@ let
     ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))}
   '';
 
+  defaultUser = "buildkite-agent";
+
 in
 
 {
@@ -56,6 +58,15 @@ in
         type = types.listOf types.package;
       };
 
+      user = mkOption {
+        type = types.str;
+        default = defaultUser;
+        description = ''
+          Set this option when you want to run the buildkite agent as something else
+          than the default user "buildkite-agent".
+        '';
+      };
+
       tokenPath = mkOption {
         type = types.path;
         description = ''
@@ -185,14 +196,14 @@ in
   };
 
   config = mkIf config.services.buildkite-agent.enable {
-    users.users.buildkite-agent =
-      { name = "buildkite-agent";
-        home = cfg.dataDir;
-        createHome = true;
-        description = "Buildkite agent user";
-        extraGroups = [ "keys" ];
-        isSystemUser = true;
-      };
+    users.users.buildkite-agent = mkIf (cfg.user == defaultUser) {
+      name = "buildkite-agent";
+      home = cfg.dataDir;
+      createHome = true;
+      description = "Buildkite agent user";
+      extraGroups = [ "keys" ];
+      isSystemUser = true;
+    };
 
     environment.systemPackages = [ cfg.package ];
 
@@ -230,7 +241,7 @@ in
 
         serviceConfig =
           { ExecStart = "${cfg.package}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
-            User = "buildkite-agent";
+            User = cfg.user;
             RestartSec = 5;
             Restart = "on-failure";
             TimeoutSec = 10;

From 95e3e3e0a8486bd63a66cc1c4229a9965a6dfd36 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 26 Oct 2019 10:44:00 -0700
Subject: [PATCH 206/755] pythonPackages.pycurl: disable flakey memory tests

---
 pkgs/development/python-modules/pycurl/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 153a6e0377db..36e5b96319e3 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -35,6 +35,7 @@ buildPythonPackage rec {
     flaky
   ];
 
+  # skip impure or flakey tests
   checkPhase = ''
     HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \
                      and not test_keyfunction \
@@ -42,7 +43,8 @@ buildPythonPackage rec {
                      and not test_libcurl_ssl_gnutls \
                      and not test_libcurl_ssl_nss \
                      and not test_libcurl_ssl_openssl" \
-                 --ignore=tests/getinfo_test.py
+                 --ignore=tests/getinfo_test.py \
+                 --ignore=tests/memory_mgmt_test.py
   '';
 
   preConfigure = ''

From b27034dfdb91b7f8654edfd451fedf75900e872b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Jan 2020 19:07:57 +0100
Subject: [PATCH 207/755] esphome: 1.14.1 -> 1.14.3, fix build

---
 pkgs/servers/home-assistant/esphome.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix
index 27dabd2a2eb2..12b36de49650 100644
--- a/pkgs/servers/home-assistant/esphome.nix
+++ b/pkgs/servers/home-assistant/esphome.nix
@@ -3,27 +3,26 @@
 let
   python = python3.override {
     packageOverrides = self: super: {
-      tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
-        version = "5.1.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409";
-        };
-      });
       protobuf = super.protobuf.override {
         protobuf = protobuf3_10;
       };
-
+      pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
+        version = "5.1.2";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81";
+        };
+      });
     };
   };
 
 in python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "1.14.1";
+  version = "1.14.3";
 
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1hw1q2fck9429077w207rk65a1krzyi6qya5pzjkpw4av5s0v0g3";
+    sha256 = "0xnsl000c5a2li9qw9anrzzq437qn1n4hcfc24i4rfq37awzmig7";
   };
 
   ESPHOME_USE_SUBPROCESS = "";

From 4de137a77d9bec92d23f36d60990e70bc101732c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 13 Jan 2020 17:52:33 -0800
Subject: [PATCH 208/755] samtools: 1.9 -> 1.10

---
 pkgs/applications/science/biology/samtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index daa2925de7c4..f2c5e9f25beb 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "samtools";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
+    sha256 = "119ms0dpydw8dkh3zc4yyw9zhdzgv12px4l2kayigv31bpqcb7kv";
   };
 
   nativeBuildInputs = [ perl ];

From 0c74d7b22e7f2fd120ca9803b024cdd87fd7f5eb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 19 Jan 2020 22:07:11 +0100
Subject: [PATCH 209/755] eclipsePlugins.jdt: fix source hash

---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 364d432f1e34..dea00c99d7e0 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -479,7 +479,7 @@ rec {
     src = fetchzip {
       stripRoot = false;
       url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.14-201912100610/org.eclipse.jdt-4.14.zip;
-      sha256 = "16c5v59mkb0cyfhf2475ds1ajma65bhqfxjr6v59hianqxq9h9la";
+      sha256 = "1c2a23qviv58xljpq3yb37ra8cqw7jh52hmzqlg1nij2sdxb6hm5";
     };
 
     meta = with stdenv.lib; {

From de752302ad95b60df6e3b32817c1d1b7ad69f26c Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Sun, 19 Jan 2020 13:44:04 -0800
Subject: [PATCH 210/755] vimPlugins.deoplete-zsh: init at 2019-11-10

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 134162717037..321f65cc799e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1020,6 +1020,17 @@ let
     };
   };
 
+  deoplete-zsh = buildVimPluginFrom2Nix {
+    pname = "deoplete-zsh";
+    version = "2019-11-10";
+    src = fetchFromGitHub {
+      owner = "deoplete-plugins";
+      repo = "deoplete-zsh";
+      rev = "92b7afc3804dd17a849b207e184359558ab8f444";
+      sha256 = "0zsbkl82kny1vmfv06iz576xsclbik0xr7ndzpb0ddhw5nfnicfx";
+    };
+  };
+
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
     version = "2020-01-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b22a811d2a80..aa1feced8bc0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -64,6 +64,7 @@ davidhalter/jedi-vim
 dcharbon/vim-flatbuffers
 deoplete-plugins/deoplete-dictionary
 deoplete-plugins/deoplete-jedi
+deoplete-plugins/deoplete-zsh
 derekelkins/agda-vim
 derekwyatt/vim-scala
 dhruvasagar/vim-table-mode

From e0ae8476fb2464fa1d6ee6431b7252118804a30f Mon Sep 17 00:00:00 2001
From: Paul Reimer <paul@p-rimes.net>
Date: Sun, 19 Jan 2020 13:47:16 -0800
Subject: [PATCH 211/755] vimPlugins.deoplete-emoji: init at 2019-01-20

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 321f65cc799e..a5e420eadbaf 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -919,6 +919,17 @@ let
     };
   };
 
+  deoplete-emoji = buildVimPluginFrom2Nix {
+    pname = "deoplete-emoji";
+    version = "2019-01-20";
+    src = fetchFromGitHub {
+      owner = "fszymanski";
+      repo = "deoplete-emoji";
+      rev = "1dfa2da6ae3ee146ddfbfdba48cf45f0c1d57d7d";
+      sha256 = "0drqbdmy8igq6rv7s2qlxsp391pydcynlr9gkaadzrg7pk4nlgsb";
+    };
+  };
+
   deoplete-fish = buildVimPluginFrom2Nix {
     pname = "deoplete-fish";
     version = "2020-01-02";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index aa1feced8bc0..cb2eebf5ea39 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -99,6 +99,7 @@ floobits/floobits-neovim
 freitass/todo.txt-vim
 frigoeu/psc-ide-vim
 fsharp/vim-fsharp
+fszymanski/deoplete-emoji
 garbas/vim-snipmate
 gentoo/gentoo-syntax
 gibiansky/vim-textobj-haskell

From ed16f830b0ce665071c782bca922c9159b936eaf Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Wed, 3 Oct 2018 09:55:41 +0200
Subject: [PATCH 212/755] rabbitmq: make all dependencies explicit

Some things were provided by default, some by systemd unit and some
were just miraculously working. This turns them into explicit
dependencies of the package itself, making everything properly
overrideable.

+ providing glibcLocales fixes elixir compile warnings

+ providing systemd dependency allows rabbit to use systemctl for unit
  activation check instead of falling back to sleep. This was seen as
  a warning during startup.
---
 nixos/modules/services/amqp/rabbitmq.nix      |  5 ++-
 pkgs/servers/amqp/rabbitmq-server/default.nix | 35 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 697732426ccf..35fb49f709a6 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -165,7 +165,10 @@ in {
       after = [ "network.target" "epmd.socket" ];
       wants = [ "network.target" "epmd.socket" ];
 
-      path = [ cfg.package pkgs.procps ];
+      path = [
+        cfg.package
+        pkgs.coreutils # mkdir/chown/chmod for preStart
+      ];
 
       environment = {
         RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index f1838f2a2cba..868fd3a6d561 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
+, procps, coreutils, gnused, systemd, glibcLocales
 , AppKit, Carbon, Cocoa
 }:
 
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
+    [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
   outputs = [ "out" "man" "doc" ];
@@ -23,15 +24,31 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)" "RMQ_ERLAPP_DIR=$(out)" ];
   installTargets = [ "install" "install-man" ];
 
-  runtimePath = stdenv.lib.makeBinPath [getconf erlang socat];
-  postInstall = ''
-    echo 'PATH=${runtimePath}:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+  preBuild = ''
+    export LANG=C.UTF-8 # fix elixir locale warning
+  '';
 
-    # we know exactly where rabbitmq is gonna be,
-    # so we patch that into the env-script
-    substituteInPlace $out/sbin/rabbitmq-env \
-      --replace 'RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH`' \
-                "RABBITMQ_SCRIPTS_DIR=$out/sbin"
+  runtimePath = stdenv.lib.makeBinPath [
+    erlang
+    getconf # for getting memory limits
+    socat systemd procps # for systemd unit activation check
+    gnused coreutils # used by helper scripts
+  ];
+  postInstall = ''
+    # rabbitmq-env calls to sed/coreutils, so provide everything early
+    sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
+
+    # rabbitmq-server script uses `dirname` to get hold of a
+    # rabbitmq-env, so let's provide this file directly. After that
+    # point everything is OK - the PATH above will kick in
+    substituteInPlace $out/sbin/rabbitmq-server \
+      --replace '`dirname $0`/rabbitmq-env' \
+                "$out/sbin/rabbitmq-env"
+
+    # We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
+    # By doing it early we make sure that auto-detection for this will
+    # never be executed (somewhere below in the script).
+    sed -i $out/sbin/rabbitmq-env -e "2s|^|RABBITMQ_SCRIPTS_DIR=$out/sbin\n|"
 
     # there’s a few stray files that belong into share
     mkdir -p $doc/share/doc/rabbitmq-server

From 0bce6f7f0ad7dd5608f2b29575a7903782d18ff4 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:36:32 +0100
Subject: [PATCH 213/755] dotnetCorePackages.sdk_2_2: remove end of life sdk

---
 pkgs/development/compilers/dotnet/default.nix | 4 ----
 pkgs/top-level/all-packages.nix               | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 1d9540ccc167..ec8a3129bdff 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -25,10 +25,6 @@ in rec {
     version = "2.1.509";
     sha512 = "4B7DC25841F56AADDD685ADB227B362177268E3D052B4ADDDAC2530889B6506B7B4768B751AE75F131143424D02EEE77B4565DAD6B49048C39D2C47E39412FDF";
   };
-  sdk_2_2 = buildNetCoreSdk {
-    version = "2.2.401";
-    sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88";
-  };
   sdk_3_0 = buildNetCoreSdk {
     version = "3.0.100";
     sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec21cb75b45d..c055c5d2f060 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -217,7 +217,11 @@ in
 
   dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
 
-  dotnet-sdk = dotnetCorePackages.sdk_2_2;
+  dotnet-sdk = dotnetCorePackages.sdk_2_1;
+
+  dotnet-netcore = dotnetCorePackages.netcore_2_1;
+
+  dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1;
 
   dumb-init = callPackage ../applications/virtualization/dumb-init {};
 

From 19b914b904bdee14ce341bb57022bc6ca1ddcda4 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:38:28 +0100
Subject: [PATCH 214/755] dotnetCorePackages.aspnetcore_2_1: 2.1.13 -> 2.1.15

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index ec8a3129bdff..ed771ecb6bfe 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -11,9 +11,11 @@ let
 in rec {
   combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {};
 
+  # v2.1.15 (LTS)
+
   aspnetcore_2_1 = buildAspNetCore {
-    version = "2.1.13";
-    sha512 = "0i9r9pq9avixv08vwcp796kdwplz90lip07y4f50s0jqwpww070qsydplnv3pixi9dfn4s169qd97c7km3qs1snvn9yasigg1vv2wqx";
+    version = "2.1.15";
+    sha512 = "a557f175cca92bb1dd66cf638ff84fe85750fab67028bd4472748b22ef0591f5f3812446a3dbe21c3d1be28c47d459d854d690dbace1b95bc7136b248af87334";
   };
 
   netcore_2_1 = buildNetCore {

From 6d5250211d283eb9c005029bf9e16e48751400aa Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:38:45 +0100
Subject: [PATCH 215/755] dotnetCorePackages.netcore_2_1: 2.1.13 -> 2.1.15

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index ed771ecb6bfe..ed19605dce31 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -19,8 +19,8 @@ in rec {
   };
 
   netcore_2_1 = buildNetCore {
-    version = "2.1.13";
-    sha512 = "2gkawhm4vk74qmdlpa9128brirwqxpa1b6w8jmcyd6j4i8lpnkp83jhmjjrjr4jdihchapp8qxb7sa1qdj21yswbpn03n86g8l3gh0h";
+    version = "2.1.15";
+    sha512 = "cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6";
   };
 
   sdk_2_1 = buildNetCoreSdk {

From 0b8b2733761e1eea6dc57ebf93d5c1384eeae05c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:39:13 +0100
Subject: [PATCH 216/755] dotnetCorePackages.sdk_2_1: 2.1.509 -> 2.1.803

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index ed19605dce31..a8ec8b16dd9d 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -24,8 +24,8 @@ in rec {
   };
 
   sdk_2_1 = buildNetCoreSdk {
-    version = "2.1.509";
-    sha512 = "4B7DC25841F56AADDD685ADB227B362177268E3D052B4ADDDAC2530889B6506B7B4768B751AE75F131143424D02EEE77B4565DAD6B49048C39D2C47E39412FDF";
+    version = "2.1.803";
+    sha512 = "57d48d6ca1bd92ac348dc05220d984811c0cf005774d7afdfbbf125a842acb0a26572146ed25a7eb26f4e0404fe840b70d1e7ec1fb7c9a5c6cfe81fefc41b363";
   };
   sdk_3_0 = buildNetCoreSdk {
     version = "3.0.100";

From d4751321368d08d72bd872d6534724727805b408 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:41:13 +0100
Subject: [PATCH 217/755] dotnetCorePackages.aspnetcore_3_0: init at 3.0.2

---
 pkgs/development/compilers/dotnet/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index a8ec8b16dd9d..a58ebc8dfcc7 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -27,6 +27,14 @@ in rec {
     version = "2.1.803";
     sha512 = "57d48d6ca1bd92ac348dc05220d984811c0cf005774d7afdfbbf125a842acb0a26572146ed25a7eb26f4e0404fe840b70d1e7ec1fb7c9a5c6cfe81fefc41b363";
   };
+
+  # v3.0.2 (Maintenance)
+
+  aspnetcore_3_0 = buildAspNetCore {
+    version = "3.0.2";
+    sha512 = "84dcc2a2a9e43afbc166771153d85b19cb09f964c85c787d77b362fd1d9e076345ae153305fa9040999846a56b69041eb89282804587478b926179d2613d259d";
+  };
+
   sdk_3_0 = buildNetCoreSdk {
     version = "3.0.100";
     sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";

From 975bc20e2c54866cce5101e442db4900f665bb53 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:41:28 +0100
Subject: [PATCH 218/755] dotnetCorePackages.netcore_3_0: init at 3.0.2

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index a58ebc8dfcc7..af80276c2460 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -35,6 +35,11 @@ in rec {
     sha512 = "84dcc2a2a9e43afbc166771153d85b19cb09f964c85c787d77b362fd1d9e076345ae153305fa9040999846a56b69041eb89282804587478b926179d2613d259d";
   };
 
+  netcore_3_0 = buildNetCore {
+    version = "3.0.2";
+    sha512 = "c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45";
+  };
+
   sdk_3_0 = buildNetCoreSdk {
     version = "3.0.100";
     sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";

From 194b5983a302ac8c4ca58a24dfabd21b3e02151e Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:41:55 +0100
Subject: [PATCH 219/755] dotnetCorePackages.sdk_3_0: 3.0.100 -> 3.0.102

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index af80276c2460..627b8cb1968f 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -41,8 +41,8 @@ in rec {
   };
 
   sdk_3_0 = buildNetCoreSdk {
-    version = "3.0.100";
-    sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";
+    version = "3.0.102";
+    sha512 = "77bc287d9c20630976ac4c0736192ba4899154c9e7cc5b87bc9d94d5d8abafdd832cfe8f385b6ba584c702d9261566109df15ab46b0d62bd218d950d3b47893e";
   };
   sdk_3_1 = buildNetCoreSdk {
     version = "3.1.100";

From f9fbf8c4c232b98078e574c14a694199fae47358 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:42:25 +0100
Subject: [PATCH 220/755] dotnetCorePackages.aspnetcore_3_1: init at 3.1.1

---
 pkgs/development/compilers/dotnet/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 627b8cb1968f..00e8ee2a8bb2 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -44,6 +44,14 @@ in rec {
     version = "3.0.102";
     sha512 = "77bc287d9c20630976ac4c0736192ba4899154c9e7cc5b87bc9d94d5d8abafdd832cfe8f385b6ba584c702d9261566109df15ab46b0d62bd218d950d3b47893e";
   };
+
+  # v3.1.1 (LTS)
+
+  aspnetcore_3_1 = buildAspNetCore {
+    version = "3.1.1";
+    sha512 = "cc27828cacbc783ef83cc1378078e14ac558aec30726b36c4f154fad0d08ff011e7e1dfc17bc851926ea3b0da9c7d71496af14ee13184bdf503856eca30a89ae";
+  };
+
   sdk_3_1 = buildNetCoreSdk {
     version = "3.1.100";
     sha512 = "0hvshwsgbm6v5hc1plzdzx8bwsdna2167fnfhxpysqs5mz7crsa4f13m4cxhrbn64lasqz2007nhdrlpgaqvgll6q8736h884aaw5sj";

From 4590d6e83c52e02f57a4f1762972d29abe0290e6 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:43:15 +0100
Subject: [PATCH 221/755] dotnetCorePackages.netcore_3_1: init at 3.1.1

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 00e8ee2a8bb2..3e013d912152 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -52,6 +52,11 @@ in rec {
     sha512 = "cc27828cacbc783ef83cc1378078e14ac558aec30726b36c4f154fad0d08ff011e7e1dfc17bc851926ea3b0da9c7d71496af14ee13184bdf503856eca30a89ae";
   };
 
+  netcore_3_1 = buildNetCore {
+    version = "3.1.1";
+    sha512 = "991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611";
+  };
+
   sdk_3_1 = buildNetCoreSdk {
     version = "3.1.100";
     sha512 = "0hvshwsgbm6v5hc1plzdzx8bwsdna2167fnfhxpysqs5mz7crsa4f13m4cxhrbn64lasqz2007nhdrlpgaqvgll6q8736h884aaw5sj";

From 1946f0ece8caa1ae02b8ad6030f02df04bfaa8a2 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:43:32 +0100
Subject: [PATCH 222/755] dotnetCorePackages.sdk_3_1: 3.1.100 -> 3.1.101

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 3e013d912152..5e5c80347123 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -58,7 +58,7 @@ in rec {
   };
 
   sdk_3_1 = buildNetCoreSdk {
-    version = "3.1.100";
-    sha512 = "0hvshwsgbm6v5hc1plzdzx8bwsdna2167fnfhxpysqs5mz7crsa4f13m4cxhrbn64lasqz2007nhdrlpgaqvgll6q8736h884aaw5sj";
+    version = "3.1.101";
+    sha512 = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1";
   };
 }

From 11569307443d0865bc22e1331313683c37b48bfe Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 02:53:02 +0100
Subject: [PATCH 223/755] jellyfin: use dotnet runtime instead of sdk

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

diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index b1116dc4a95d..6da342ae8803 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg,
+{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-netcore, ffmpeg,
   fontconfig, freetype }:
 
 let
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    dotnet-sdk
+    dotnet-netcore
     sqlite
   ];
 
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     install -dm 755 "$out/opt/jellyfin"
     cp -r * "$out/opt/jellyfin"
 
-    makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \
+    makeWrapper "${dotnet-netcore}/bin/dotnet" $out/bin/jellyfin \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         sqlite fontconfig freetype stdenv.cc.cc.lib
       ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \

From 61fd512651ffe0163ef4ccdfbcd0e34dd6acc78c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 18 Jan 2020 03:25:17 +0100
Subject: [PATCH 224/755] wasabiwallet: use dotnet runtime instead of sdk

---
 pkgs/applications/blockchains/wasabiwallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 9599dc9407c3..6b9630fa6b70 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, openssl, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }:
+{ stdenv, fetchurl, makeDesktopItem, openssl, xorg, curl, fontconfig, krb5, zlib, dotnet-netcore }:
 
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cd $out/opt/${pname}
     for i in $(find . -type f -name '*.so') wassabee
       do
-        patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
+        patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-netcore ]} $i
       done
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
     ln -s $out/opt/${pname}/wassabee $out/bin/${pname}

From e6b963ed1689bd1ec275599a37decdb4ee866f91 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 19 Jan 2020 14:52:58 +0100
Subject: [PATCH 225/755] dotnetCorePackages.sdk_2_2: throw EOL exception

---
 pkgs/development/compilers/dotnet/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 5e5c80347123..58d49a505156 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -28,6 +28,10 @@ in rec {
     sha512 = "57d48d6ca1bd92ac348dc05220d984811c0cf005774d7afdfbbf125a842acb0a26572146ed25a7eb26f4e0404fe840b70d1e7ec1fb7c9a5c6cfe81fefc41b363";
   };
 
+  # v2.2
+
+  sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1";
+
   # v3.0.2 (Maintenance)
 
   aspnetcore_3_0 = buildAspNetCore {

From ac56988f21c0bb22c9346a343cd3c6f7943c18dd Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 19 Jan 2020 22:30:54 +0100
Subject: [PATCH 226/755] dotnet-sdk_2: add alias

---
 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 c055c5d2f060..31668498be8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -219,6 +219,8 @@ in
 
   dotnet-sdk = dotnetCorePackages.sdk_2_1;
 
+  dotnet-sdk_2 = dotnetCorePackages.sdk_2_1;
+
   dotnet-netcore = dotnetCorePackages.netcore_2_1;
 
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1;

From 21f74cc3aba4dd4c8540b35f8cd0873bef15a2d6 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 19 Jan 2020 22:31:07 +0100
Subject: [PATCH 227/755] dotnet-sdk_3: add alias

---
 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 31668498be8c..1bb7da688439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -221,6 +221,8 @@ in
 
   dotnet-sdk_2 = dotnetCorePackages.sdk_2_1;
 
+  dotnet-sdk_3 = dotnetCorePackages.sdk_3_1;
+
   dotnet-netcore = dotnetCorePackages.netcore_2_1;
 
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1;

From 46773a15b3af302c3fb2a6e31fb589553a903099 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Jan 2020 00:44:07 +0100
Subject: [PATCH 228/755] nixos/version: fix case where .git is a symlink

Before c9214c394b248e1f26e45dbe1be2bd82363af3a6 and
9d396d2e426b9a765de0b8999aa214f1259633e6 if .git is symlink the version
would gracefully default to no git revision. With those changes an
exception is thrown instead.

This introduces a new function `pathIsGitRepo` that checks if
`commitIdFromGitRepo` fails without error so we don't have to
reimplement this logic again and can fail gracefully.
---
 lib/default.nix                | 2 +-
 lib/sources.nix                | 1 +
 lib/trivial.nix                | 2 +-
 nixos/modules/misc/version.nix | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 5abafe1b2acf..d2e9f0e8086c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -101,7 +101,7 @@ let
     inherit (sources) pathType pathIsDirectory cleanSourceFilter
       cleanSource sourceByRegex sourceFilesBySuffices
       commitIdFromGitRepo cleanSourceWith pathHasContext
-      canCleanSource pathIsRegularFile;
+      canCleanSource pathIsRegularFile pathIsGitRepo;
     inherit (modules) evalModules unifyModuleSyntax
       applyIfFunction mergeModules
       mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
diff --git a/lib/sources.nix b/lib/sources.nix
index a5765c0fda5b..05519c3e392e 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -105,6 +105,7 @@ rec {
       in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
     in cleanSourceWith { inherit filter; src = path; };
 
+  pathIsGitRepo = path: (builtins.tryEval (commitIdFromGitRepo path)).success;
 
   # Get the commit id of a git repo
   # Example: commitIdFromGitRepo <nixpkgs/.git>
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 940ec1a3d59e..a281cd70fb0e 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -191,7 +191,7 @@ rec {
     let
       revisionFile = "${toString ./..}/.git-revision";
       gitRepo      = "${toString ./..}/.git";
-    in if builtins.pathExists gitRepo
+    in if lib.pathIsGitRepo gitRepo
        then lib.commitIdFromGitRepo gitRepo
        else if lib.pathExists revisionFile then lib.fileContents revisionFile
        else default;
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index ddbd3963cc57..8a85035ceb7c 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -6,6 +6,7 @@ let
   cfg = config.system.nixos;
 
   gitRepo      = "${toString pkgs.path}/.git";
+  gitRepoValid = lib.pathIsGitRepo gitRepo;
   gitCommitId  = lib.substring 0 7 (commitIdFromGitRepo gitRepo);
 in
 
@@ -91,8 +92,8 @@ in
       # These defaults are set here rather than up there so that
       # changing them would not rebuild the manual
       version = mkDefault (cfg.release + cfg.versionSuffix);
-      revision      = mkIf (pathExists gitRepo) (mkDefault            gitCommitId);
-      versionSuffix = mkIf (pathExists gitRepo) (mkDefault (".git." + gitCommitId));
+      revision      = mkIf gitRepoValid (mkDefault            gitCommitId);
+      versionSuffix = mkIf gitRepoValid (mkDefault (".git." + gitCommitId));
     };
 
     # Generate /etc/os-release.  See

From fa3d651ee73c8d0fa5f450b405bd7169138b6450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 7 Dec 2019 08:57:07 +0100
Subject: [PATCH 229/755] spidermonkey_52: init at 52.9.0

---
 pkgs/desktops/cinnamon/cjs/fix-werror.patch   | 39 ++++++++
 .../desktops/cinnamon/cjs/spidermonkey_52.nix | 95 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cjs/fix-werror.patch
 create mode 100644 pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix

diff --git a/pkgs/desktops/cinnamon/cjs/fix-werror.patch b/pkgs/desktops/cinnamon/cjs/fix-werror.patch
new file mode 100644
index 000000000000..0218eba3b46e
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cjs/fix-werror.patch
@@ -0,0 +1,39 @@
+From 1b802175914418f5675047c34f1ab1593dd35b18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Wed, 8 Jan 2020 11:04:27 +0100
+Subject: [PATCH] fix werror
+
+---
+ js/src/moz.build       | 2 +-
+ js/src/shell/moz.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/src/moz.build b/js/src/moz.build
+index 1162cb70c..595ea9842 100644
+--- a/js/src/moz.build
++++ b/js/src/moz.build
+@@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']:
+         DEFINES['FFI_BUILDING'] = True
+ 
+ if CONFIG['GNU_CXX']:
+-    CXXFLAGS += ['-Wno-shadow', '-Werror=format']
++    CXXFLAGS += ['-Wno-shadow']
+ 
+ # Suppress warnings in third-party code.
+ if CONFIG['CLANG_CXX']:
+diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
+index 72ea8145c..77475b241 100644
+--- a/js/src/shell/moz.build
++++ b/js/src/shell/moz.build
+@@ -51,7 +51,7 @@ shellmoduleloader.inputs = [
+ ]
+ 
+ if CONFIG['GNU_CXX']:
+-    CXXFLAGS += ['-Wno-shadow', '-Werror=format']
++    CXXFLAGS += ['-Wno-shadow']
+ 
+ # This is intended as a temporary workaround to enable VS2015.
+ if CONFIG['_MSC_VER']:
+-- 
+2.17.1
+
diff --git a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix
new file mode 100644
index 000000000000..87f670c8c099
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix
@@ -0,0 +1,95 @@
+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }:
+
+let
+  version = "52.9.0";
+in stdenv.mkDerivation {
+  pname = "spidermonkey";
+  inherit version;
+
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
+    sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
+  };
+
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false; # Configure script only understands --includedir
+
+  buildInputs = [ readline icu zlib nspr ];
+  nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ];
+
+  # Apparently this package fails to build correctly with modern compilers, which at least
+  # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey.
+  # These flags were stolen from:
+  # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/js52
+  NIX_CFLAGS_COMPILE = "-fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp";
+
+  patches = [
+    # needed to build gnome3.gjs
+    (fetchpatch {
+      name = "mozjs52-disable-mozglue.patch";
+      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be;
+      sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0";
+    })
+    (fetchpatch {
+      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52;
+      sha256 = "1vsw6558lxiy0r1mg6y49cgddan1mfqvqlkyv734bgxyg6n3pb9i";
+    })
+    ./fix-werror.patch
+  ];
+
+  configurePlatforms = [ ];
+
+  preConfigure = ''
+    export CXXFLAGS="-fpermissive"
+    export LIBXUL_DIST=$out
+    export PYTHON="${buildPackages.python2.interpreter}"
+    configureFlagsArray+=("--includedir=$dev/include")
+
+    cd js/src
+
+    autoconf
+  '';
+
+  configureFlags = [
+    "--with-nspr-prefix=${nspr}"
+    "--with-system-zlib"
+    "--with-system-icu"
+    "--with-intl-api"
+    "--enable-readline"
+    "--enable-shared-js"
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"
+    ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--host=${stdenv.buildPlatform.config}"
+    "--target=${stdenv.hostPlatform.config}"
+  ];
+
+  makeFlags = [
+    "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
+  ];
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  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;
+    license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
+    maintainers = [ maintainers.abbradar ];
+    platforms = platforms.linux;
+
+    # Commented out so hydra builds the package
+    # (I know what you're thinking now, but cjs won't be pulling anything from the network
+    #  and modules are allowed to execute commands anyways, so an RCE is basically irrelevant)
+    #
+    # knownVulnerabilities = [
+    #   "The runtime was extracted from Firefox 52, which EOL’d on September 5, 2018."
+    # ];
+  };
+}

From 7238168f4f49e78092622c32fbcbe074102d215f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 18 Jan 2020 17:25:42 +0100
Subject: [PATCH 230/755] cinnamon.cjs: init at 4.4.0

---
 pkgs/desktops/cinnamon/cjs/default.nix | 82 ++++++++++++++++++++++++++
 pkgs/desktops/cinnamon/default.nix     |  3 +-
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/cinnamon/cjs/default.nix

diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
new file mode 100644
index 000000000000..7d9ba7cc438e
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -0,0 +1,82 @@
+{ autoconf-archive
+, autoreconfHook
+, dbus-glib
+, fetchFromGitHub
+, gobject-introspection
+, pkgconfig
+, stdenv
+, wrapGAppsHook
+, python3
+, cairo
+, gnome3
+, xapps
+, keybinder3
+, upower
+, callPackage
+, glib
+, libffi
+, gtk3
+, readline
+}:
+
+let
+
+  # https://github.com/linuxmint/cjs/issues/80
+  spidermonkey_52 = callPackage ./spidermonkey_52.nix {};
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "cjs";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0q5h2pbwysc6hwq5js3lwi6zn7i5qjjy070ynfhfn3z69lw5iz2d";
+  };
+
+  propagatedBuildInputs = [
+    glib
+
+    # bindings
+    gnome3.caribou
+    keybinder3
+    upower
+    xapps
+  ];
+
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    wrapGAppsHook
+    pkgconfig
+  ];
+
+  buildInputs = [
+    # from .pc
+    gobject-introspection
+    libffi
+    spidermonkey_52 # mozjs-52
+    cairo # +cairo-gobject
+    gtk3
+
+    # other
+
+    dbus-glib
+    readline
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cjs";
+    description = "JavaScript bindings for Cinnamon";
+
+    longDescription = ''
+      This module contains JavaScript bindings based on gobject-introspection.
+    '';
+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 445890782414..b26b3f00075a 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,5 +1,6 @@
 { pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
-  xapps = callPackage ./xapps {};
+  cjs = callPackage ./cjs { };
+  xapps = callPackage ./xapps { };
 })

From e105a952c23e272dc1b19eca3467d0a19c49d121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 02:02:20 +0100
Subject: [PATCH 231/755] cinnamon.cinnamon-desktop: init at 4.4.0

---
 .../cinnamon/cinnamon-desktop/default.nix     | 76 +++++++++++++++++++
 pkgs/desktops/cinnamon/default.nix            |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-desktop/default.nix

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
new file mode 100644
index 000000000000..094140cbf4ee
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@@ -0,0 +1,76 @@
+{ fetchFromGitHub
+, gdk-pixbuf
+, gobject-introspection
+, gtk3
+, intltool
+, meson
+, ninja
+, pkgconfig
+, pulseaudio
+, python3
+, stdenv
+, xkeyboard_config
+, xorg
+, wrapGAppsHook
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cinnamon-desktop";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "17hb8gkb9pfj56ckva5g4x83yvmdv7hvpidxjsdf79dw6pabr5rg";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  propagatedBuildInputs = [
+    glib
+    gtk3
+    pulseaudio
+  ];
+
+  buildInputs = [
+    gdk-pixbuf
+    xkeyboard_config
+    xorg.libxkbfile
+    xorg.libXext
+    xorg.libXrandr
+    gobject-introspection
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    python3
+    wrapGAppsHook
+    intltool
+    pkgconfig
+  ];
+
+  postPatch = ''
+    chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
+    patchShebangs install-scripts/meson_install_schemas.py
+    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cinnamon-desktop";
+    description = "Library and data for various Cinnamon modules";
+
+    longDescription = ''
+      The libcinnamon-desktop library provides API shared by several applications
+      on the desktop, but that cannot live in the platform for various
+      reasons. There is no API or ABI guarantee, although we are doing our
+      best to provide stability. Documentation for the API is available with
+      gtk-doc.
+    '';
+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index b26b3f00075a..4ffbf8f6bb31 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,6 +1,7 @@
 { pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
+  cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cjs = callPackage ./cjs { };
   xapps = callPackage ./xapps { };
 })

From 363840f32d2c1765b1fb99d44852972d6f614c18 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 01:03:40 +0000
Subject: [PATCH 232/755] atlassian-cli: 9.0.0 -> 9.1.0

---
 pkgs/applications/office/atlassian-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 6894f1ca635a..021eadb64768 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-cli";
-  version = "9.0.0";
+  version = "9.1.0";
   
   src = fetchzip {
     url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256  = "1z8723krq65fcy5aapgiz216vrpw2nw8fbn1h3a4zpis7kw8qp0f";
+    sha256  = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k";
     extraPostFetch = "chmod go-w $out";
   };
   

From 4a5c337397cd881cccfb8216c8ffb01025e3df1b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 19 Jan 2020 20:20:20 -0500
Subject: [PATCH 233/755] nfpm: 1.1.8 -> 1.1.10

---
 pkgs/tools/package-management/nfpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index a4acdf0a3413..60091742e0d0 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "1.1.8";
+  version = "1.1.10";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yy75iagyrr96y7497hbbizrm59c757mshwicl1b7ni2sn3p63fh";
+    sha256 = "0qn9hybqnhyf1xb6n0m4qq2ac8h187i2pjkkik73qly1hmyq45j7";
   };
 
-  modSha256 = "05hcn0k1zb4k4p3aaas7b276jw607cv290np9vmyqxb3khzv4vjg";
+  modSha256 = "037ihnvssgkzbg94yfw4lwqnhj02m187dfn1fm7i6yv13kf0gkpx";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From aa290f97d0bf2606970eb70a1681f18299bc43cf Mon Sep 17 00:00:00 2001
From: Danju Visvanathan <danju@canva.com>
Date: Mon, 20 Jan 2020 12:58:51 +1100
Subject: [PATCH 234/755] nodePackages_12_x: add node-gyp

---
 .../node-packages/node-packages-v12.json      |   7 +-
 .../node-packages/node-packages-v12.nix       | 510 +++++++++++++++---
 2 files changed, 447 insertions(+), 70 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v12.json b/pkgs/development/node-packages/node-packages-v12.json
index 3acee4158645..01f36b015ca5 100644
--- a/pkgs/development/node-packages/node-packages-v12.json
+++ b/pkgs/development/node-packages/node-packages-v12.json
@@ -1,6 +1,9 @@
 [
-  "nijs"
-, "coffee-script"
+  "coffee-script"
 , "grunt-cli"
+, "nijs"
 , "node2nix"
+, "node-gyp"
+, "node-gyp-build"
+, "node-pre-gyp"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index f4cba080a614..08122a11ee2d 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -157,13 +157,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.9.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
-        sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -382,6 +382,15 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
+    "debug-3.2.6" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+      };
+    };
     "decode-uri-component-0.2.0" = {
       name = "decode-uri-component";
       packageName = "decode-uri-component";
@@ -391,6 +400,15 @@ let
         sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
       };
     };
+    "deep-extend-0.6.0" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+      };
+    };
     "define-property-0.2.5" = {
       name = "define-property";
       packageName = "define-property";
@@ -445,6 +463,15 @@ let
         sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
       };
     };
+    "detect-libc-1.0.3" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";
+        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
+      };
+    };
     "ecc-jsbn-0.1.2" = {
       name = "ecc-jsbn";
       packageName = "ecc-jsbn";
@@ -454,6 +481,15 @@ let
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
+    "env-paths-2.2.0" = {
+      name = "env-paths";
+      packageName = "env-paths";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz";
+        sha512 = "6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==";
+      };
+    };
     "expand-brackets-2.1.4" = {
       name = "expand-brackets";
       packageName = "expand-brackets";
@@ -832,6 +868,24 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "ignore-walk-3.0.3" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
+        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
+      };
+    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1165,13 +1219,13 @@ let
         sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
-    "kind-of-6.0.2" = {
+    "kind-of-6.0.3" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
+        sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
     "liftoff-2.5.0" = {
@@ -1219,22 +1273,22 @@ let
         sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
-    "mime-db-1.42.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.42.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
-        sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.25" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.25";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
-        sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -1255,6 +1309,15 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
     "minipass-2.9.0" = {
       name = "minipass";
       packageName = "minipass";
@@ -1309,6 +1372,15 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
+    "ms-2.1.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
     "nanomatch-1.2.13" = {
       name = "nanomatch";
       packageName = "nanomatch";
@@ -1327,6 +1399,15 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
+    "needle-2.4.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
+        sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
+      };
+    };
     "nijs-0.0.25" = {
       name = "nijs";
       packageName = "nijs";
@@ -1363,6 +1444,24 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
+    "npm-bundled-1.1.1" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
+      };
+    };
+    "npm-normalize-package-bin-1.0.1" = {
+      name = "npm-normalize-package-bin";
+      packageName = "npm-normalize-package-bin";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+      };
+    };
     "npm-package-arg-6.1.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -1372,6 +1471,15 @@ let
         sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==";
       };
     };
+    "npm-packlist-1.4.7" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz";
+        sha512 = "vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==";
+      };
+    };
     "npm-registry-client-8.6.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -1624,13 +1732,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "psl-1.6.0" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz";
-        sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
     "punycode-1.4.1" = {
@@ -1660,13 +1768,22 @@ let
         sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
-    "readable-stream-2.3.6" = {
+    "rc-1.2.8" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
+      };
+    };
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "rechoir-0.6.2" = {
@@ -1714,13 +1831,13 @@ let
         sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
       };
     };
-    "resolve-1.14.1" = {
+    "resolve-1.14.2" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.14.1";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz";
-        sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz";
+        sha512 = "EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -1777,6 +1894,15 @@ let
         sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
       };
     };
+    "rimraf-2.7.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+      };
+    };
     "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -1813,6 +1939,15 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+      };
+    };
     "semver-4.3.6" = {
       name = "semver";
       packageName = "semver";
@@ -1921,13 +2056,13 @@ let
         sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
       };
     };
-    "source-map-resolve-0.5.2" = {
+    "source-map-resolve-0.5.3" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -2038,6 +2173,15 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
     "tar-4.4.13" = {
       name = "tar";
       packageName = "tar";
@@ -2191,13 +2335,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.3.3" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.3";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
-        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "v8flags-3.1.3" = {
@@ -2284,28 +2428,6 @@ let
   };
 in
 {
-  nijs = nodeEnv.buildNodePackage {
-    name = "nijs";
-    packageName = "nijs";
-    version = "0.0.25";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
-      sha1 = "04b035cb530d46859d1018839a518c029133f676";
-    };
-    dependencies = [
-      sources."optparse-1.0.5"
-      sources."slasp-0.0.4"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "An internal DSL for the Nix package manager in JavaScript";
-      homepage = "https://github.com/svanderburg/nijs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
@@ -2452,7 +2574,7 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      sources."kind-of-6.0.2"
+      sources."kind-of-6.0.3"
       sources."liftoff-2.5.0"
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
@@ -2497,7 +2619,7 @@ in
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.14.1"
+      sources."resolve-1.14.2"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -2536,7 +2658,7 @@ in
         ];
       })
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.2"
+      sources."source-map-resolve-0.5.3"
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
       (sources."static-extend-0.1.2" // {
@@ -2590,6 +2712,28 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  nijs = nodeEnv.buildNodePackage {
+    name = "nijs";
+    packageName = "nijs";
+    version = "0.0.25";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
+      sha1 = "04b035cb530d46859d1018839a518c029133f676";
+    };
+    dependencies = [
+      sources."optparse-1.0.5"
+      sources."slasp-0.0.4"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An internal DSL for the Nix package manager in JavaScript";
+      homepage = "https://github.com/svanderburg/nijs#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
@@ -2608,7 +2752,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.0"
+      sources."aws4-1.9.1"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -2671,8 +2815,8 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.1"
-      sources."mime-db-1.42.0"
-      sources."mime-types-2.1.25"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.9.0"
@@ -2716,16 +2860,16 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."psl-1.6.0"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      (sources."readable-stream-2.3.6" // {
+      (sources."readable-stream-2.3.7" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
       sources."request-2.88.0"
-      sources."resolve-1.14.1"
+      sources."resolve-1.14.2"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
@@ -2761,7 +2905,7 @@ in
       sources."uid-number-0.0.5"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.3"
+      sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -2780,4 +2924,234 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  node-gyp = nodeEnv.buildNodePackage {
+    name = "node-gyp";
+    packageName = "node-gyp";
+    version = "6.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz";
+      sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ajv-6.10.2"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."brace-expansion-1.1.11"
+      sources."caseless-0.12.0"
+      sources."chownr-1.1.3"
+      sources."code-point-at-1.1.0"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."env-paths-2.2.0"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.6"
+      sources."graceful-fs-4.2.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-unicode-2.0.1"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.1"
+      sources."nopt-4.0.1"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."path-is-absolute-1.0.1"
+      sources."performance-now-2.1.0"
+      sources."process-nextick-args-2.0.1"
+      sources."psl-1.7.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.7"
+      sources."request-2.88.0"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."sshpk-1.16.1"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."tar-4.4.13"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js native addon build tool";
+      homepage = "https://github.com/nodejs/node-gyp#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  node-gyp-build = nodeEnv.buildNodePackage {
+    name = "node-gyp-build";
+    packageName = "node-gyp-build";
+    version = "4.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
+      sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Build tool and bindings loader for node-gyp that supports prebuilds";
+      homepage = https://github.com/prebuild/node-gyp-build;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  node-pre-gyp = nodeEnv.buildNodePackage {
+    name = "node-pre-gyp";
+    packageName = "node-pre-gyp";
+    version = "0.14.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+      sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."chownr-1.1.3"
+      sources."code-point-at-1.1.0"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."debug-3.2.6"
+      sources."deep-extend-0.6.0"
+      sources."delegates-1.0.0"
+      sources."detect-libc-1.0.3"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."glob-7.1.6"
+      sources."has-unicode-2.0.1"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-walk-3.0.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."isarray-1.0.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."needle-2.4.0"
+      sources."nopt-4.0.1"
+      sources."npm-bundled-1.1.1"
+      sources."npm-normalize-package-bin-1.0.1"
+      sources."npm-packlist-1.4.7"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."path-is-absolute-1.0.1"
+      sources."process-nextick-args-2.0.1"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."readable-stream-2.3.7"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."tar-4.4.13"
+      sources."util-deprecate-1.0.2"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js native addon binary install tool";
+      homepage = "https://github.com/mapbox/node-pre-gyp#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file

From e74dac0ae35a0fb86b1c6d0897f3391669853a7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 02:48:50 +0000
Subject: [PATCH 235/755] bshapr: 0.6 -> 0.7

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

diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix
index 732a8cf1ce2f..88a671495c38 100644
--- a/pkgs/applications/audio/bshapr/default.nix
+++ b/pkgs/applications/audio/bshapr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "BShapr";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mi8f0svq1h9cmmxyskcazr5x2q4dls3j9jc6ahi5rlk7i0bpa74";
+    sha256 = "1422xay28jkmqlj5y4vhb57kljy6ysvxh20cxpfxm980m8n54gq5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 02fad0d598701e68a6d3728b530e8b2fdeb8109e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 03:00:35 +0000
Subject: [PATCH 236/755] acme-sh: 2.8.3 -> 2.8.5

---
 pkgs/tools/admin/acme.sh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index cdf58bc0215d..25a92f1117bb 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
 stdenv.mkDerivation rec {
   pname = "acme.sh";
-  version = "2.8.3";
+  version = "2.8.5";
 
   src = fetchFromGitHub {
     owner = "Neilpang";
     repo = "acme.sh";
     rev = version;
-    sha256 = "0j9wn61jd107fq9ww79399s7adql0vf897s0xavlvv6chq8a6ajj";
+    sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 68ee1de5d2a0f6333c5ab037cd8ad6014a5dbbb4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 03:07:05 +0000
Subject: [PATCH 237/755] asymptote: 2.61 -> 2.62

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

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 31bdba26783e..6246a5733405 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.61";
+  version = "2.62";
   pname = "asymptote";
 
   src = fetchFromGitHub {
     owner = "vectorgraphics";
     repo = pname;
     rev = version;
-    sha256 = "0nblcxqzaxv1286zl2fjkivgp478l0nf3m0wnk78rd99lscjlw71";
+    sha256 = "1lb3a8r2gv0437viwy25s34g05x5v81gk0nxlgx7hzwv7b9zkv5s";
   };
 
   nativeBuildInputs = [

From cc1bed591980e067ce45365cbfc33f13ac157ec5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 03:48:35 +0000
Subject: [PATCH 238/755] diffoscope: 133 -> 135

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index c9f61ee34592..97b4aa1db281 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "133";
+  version = "135";
 
   src = fetchurl {
     url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "15hi2fwcx3sf189rmxpyah0amq1a49wgp1ynhvwij5qj13wib2q8";
+    sha256 = "1grf28mb6lyxdqbmvws4h7inalda9z7qnjx7dc859mzkf54cn3yd";
   };
 
   patches = [

From 2e067c7a2d443477296326b3edf1f5e9f0110689 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 04:23:13 +0000
Subject: [PATCH 239/755] bviplus: 0.9.4 -> 1.0

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

diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index 7d70ad14b5db..5fab7fe9da62 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bviplus";
-  version = "0.9.4";
+  version = "1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
-    sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb";
+    sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg";
   };
 
   buildInputs = [

From 33f55c4c746b91b1fde3b4e1fa5dce1c24523a2c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 06:09:08 +0000
Subject: [PATCH 240/755] drawio: 12.4.2 -> 12.5.3

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

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index c71e95b21af8..c81ad47db84f 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "12.4.2";
+  version = "12.5.3";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "1mngn90cn9hixa0xkhk7mb02gjp480wnipjy2jzkq8kwpai1gm1m";
+    sha256 = "048lksq2akkyi5jg1fiz455n2nv6w58kv8xb9y41qms5dshpww2q";
   };
 
   nativeBuildInputs = [

From d7e04bb440309233a2a35e93c90edb945ee36833 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 07:38:24 +0000
Subject: [PATCH 241/755] fanficfare: 3.13.0 -> 3.15.0

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

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index b01317a532ff..3f6fcbdc7100 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
-  version = "3.13.0";
+  version = "3.15.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "01mrqqz2rv6abdsk80nxizsm5h68m12bqkdsjyqfzyxl0kn7zs0v";
+    sha256 = "12nsrl8nvg52mi136m7ayvaivwjapn7ry95137ynj1njy2w990hm";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 61f264fc4194d8f41756a4aec38aa362307a67b4 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 19 Jan 2020 12:15:08 +0000
Subject: [PATCH 242/755] open-vm-tools: 11.0.1 -> 11.0.5

---
 pkgs/applications/virtualization/open-vm-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 8261ead38921..87ec2e52f13a 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "open-vm-tools";
-  version = "11.0.1";
+  version = "11.0.5";
 
   src = fetchFromGitHub {
     owner  = "vmware";
     repo   = "open-vm-tools";
     rev    = "stable-${version}";
-    sha256 = "1p499ilb2j1s0d7qf19b8nig8ggdq7b60xcgb7bc18g8kp5g82lv";
+    sha256 = "0idh8dqwb1df2di689090k9x1iap35jk3wg8yb1g70byichmscqb";
   };
 
   sourceRoot = "${src.name}/open-vm-tools";

From 0928c40c29e48646a04cc5bf03b9922adb8d9022 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 08:51:55 +0000
Subject: [PATCH 243/755] graylog: 3.1.3 -> 3.1.4

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index d56f44aacefc..46812da8954b 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graylog";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0jwfq9q10nz6fy9ac2j4fcf0liz4vj0q7jmfhy9dsa3476zccwa8";
+    sha256 = "1z7jy82dk5l2yxmcb7y0jws4p1l367fxj69pfi10ajssj66vwjfw";
   };
 
   dontBuild = true;

From 61870727de81a60fb5881dc00e8b5450beebdec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=BCrmann?= <me@jonas-schuermann.name>
Date: Mon, 20 Jan 2020 09:54:14 +0100
Subject: [PATCH 244/755] mirrors.nix: Use HTTPS in maven mirrors

Since 2020-01-15, the maven central repository does no longer support HTTP.
See https://blog.sonatype.com/central-repository-moving-to-https for details.
---
 pkgs/build-support/fetchurl/mirrors.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index c0e115bca280..a0a61f7cc50b 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -425,8 +425,8 @@
 
   # Maven Central
   maven = [
-    http://repo1.maven.org/maven2/
-    http://central.maven.org/maven2/
+    https://repo1.maven.org/maven2/
+    https://central.maven.org/maven2/
   ];
 
   # Alsa Project

From 465dc6e2249cac4bed24abbebc19f15c6d3b197d Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 20 Jan 2020 10:08:48 +0100
Subject: [PATCH 245/755] dbeaver: 6.3.2 -> 6.3.3

---
 pkgs/applications/misc/dbeaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index d0011eee9c14..f6236a301dba 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "6.3.2";
+  version = "6.3.3";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0yr79p4vdg6s6c8sry6qnf2ifjcjdapn0sff2crsnz331rsh27sm";
+    sha256 = "08rf7igfzh5g40bapsj0f424jxfx62y97syr3fxmqv3ik7iav9k4";
   };
 
   installPhase = ''

From 6b023dc690f50121bfa535f31c62d5edf0ec66a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Jan 2020 22:15:43 +0100
Subject: [PATCH 246/755] ocamlPackages.re2: fix building with clang

---
 pkgs/development/ocaml-modules/janestreet/0.12.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
index f912bdaa21f1..4585a3b8596c 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -398,6 +398,10 @@ rec {
     hash = "1sw32lb0y501y971ij7287796lvfhs0nfgla895r74ymfks2rcjb";
     meta.description = "OCaml bindings for RE2, Google's regular expression library";
     propagatedBuildInputs = [ core_kernel ];
+    prePatch = ''
+      substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
+      substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
+    '';
   };
 
   shell = janePackage {

From 2708dfa249739ce7240e65c0d95176e2158db71f Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 19 Jan 2020 23:29:21 -0800
Subject: [PATCH 247/755] wine-gecko: 2.47 -> 2.47.1

---
 pkgs/misc/emulators/wine/sources.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ca82935b7675..ff26863681de 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -19,14 +19,14 @@ in rec {
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
-      version = "2.47";
-      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
-      sha256 = "0fk4fwb4ym8xn0i5jv5r5y198jbpka24xmxgr8hjv5b3blgkd2iv";
+      version = "2.47.1";
+      url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
+      sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh";
     };
     gecko64 = fetchurl rec {
-      version = "2.47";
-      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
-      sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5";
+      version = "2.47.1";
+      url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
+      sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9";
     };
 
     ## see http://wiki.winehq.org/Mono

From ed1b996fef00cbce3af9935460e9fff350e2b9cf Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 19 Jan 2020 23:29:46 -0800
Subject: [PATCH 248/755] wine-mono: 4.9.3 -> 4.9.4

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ff26863681de..dd97f286174d 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,9 +31,9 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.9.3";
-      url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "0va7nbhvfb52g78s9k3zc6xxwsn5whfyn333s6fdxycp8rkvgxkw";
+      version = "4.9.4";
+      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
+      sha256 = "1p8g45xphxnns7dkg9rbaknarbjy5cjhrngaf0fsgk9z68wgz9ji";
     };
   };
 

From f3410e914cb50f29c1b15beae04e59403cc9a5e3 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 19 Jan 2020 23:30:40 -0800
Subject: [PATCH 249/755] wine-{unstable,staging}: 5.0-rc2 -> 5.0-rc6

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index dd97f286174d..13b87ac54bc9 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "5.0-rc2";
+    version = "5.0-rc6";
     url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
-    sha256 = "1dj2z7yikab0hc06hf2kafanbaa49ignghzxq5a3la5mg8ya4vd7";
+    sha256 = "1d1kv7ppqq5irx3wv2lw810ylg8wk1nddc1kwb936v5qrkkgifwc";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0zzlzz2nagrkq3m2v900w5j7k0vvxbdqffvsnjxxha8k6axl4z53";
+    sha256 = "193z92gpw7f421a4sa46qmp90pnbgglrlgyzfs5zpap32zmwhrqz";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From af34067529a391968ee1530f1b7947a6cc3b8446 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 19 Jan 2020 23:30:58 -0800
Subject: [PATCH 250/755] winetricks: 20190912 -> 20191224

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 13b87ac54bc9..21d00b30dcba 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
-    version = "20190912";
-    sha256 = "08my9crgpj5ai77bm64v99x4kmdb9dl8fw14581n69id449v7gzv";
+    version = "20191224";
+    sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 411f068871aaa1796dc7d71cb12dde462aeb0a14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2020 10:25:17 +0100
Subject: [PATCH 251/755] stockfish: update from version 10 to 11

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

diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 07ca9223bb0c..1919383048e5 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -4,7 +4,7 @@ let arch = if stdenv.isx86_64 then "x86-64" else
            if stdenv.isi686 then "x86-32" else
            "unknown";
 
-    version = "10";
+    version = "11";
 in
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
-    sha256 = "1lrxqq8fw1wrw5b45r4s3ddd51yr85a2k8a9i1wjvyd6v9vm7761";
+    sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0";
   };
 
   postUnpack = "sourceRoot+=/src";

From 7838f0082491e1835221419b3adba0467a4446ce Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 19 Jan 2020 21:48:59 +0100
Subject: [PATCH 252/755] nixos/buildkite: stop using deprecated option

---
 .../services/continuous-integration/buildkite-agent.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 49160b43c619..aa717c466ee6 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -225,8 +225,8 @@ in
         in
           ''
             mkdir -m 0700 -p "${sshDir}"
-            cp -f "${toString cfg.openssh.privateKeyPath}" "${sshDir}/id_rsa"
-            chmod 600 "${sshDir}"/id_rsa*
+            cp -f "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa"
+            chmod 600 "${sshDir}"/id_rsa
 
             cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
             token="$(cat ${toString cfg.tokenPath})"

From 70308a7daf3e1d555de42f7bb557caa4fdd8b542 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 19 Jan 2020 21:49:19 +0100
Subject: [PATCH 253/755] nixos/buildkite-agent: add gnutar, gzip and git to
 runtimePackages

These are required for nix to do builtins.fetchTarball and
builtins.fetchGit, so most likely we want them to be around.
---
 .../services/continuous-integration/buildkite-agent.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index aa717c466ee6..66f04b0a424b 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -52,8 +52,8 @@ in
       };
 
       runtimePackages = mkOption {
-        default = [ pkgs.bash pkgs.nix ];
-        defaultText = "[ pkgs.bash pkgs.nix ]";
+        default = [ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ];
+        defaultText = "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]";
         description = "Add programs to the buildkite-agent environment";
         type = types.listOf types.package;
       };

From a208e6eb994b997542528371ffa483c7deda98fe Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 19 Jan 2020 21:50:52 +0100
Subject: [PATCH 254/755] nixosTests.buildkite: add test

---
 nixos/tests/all-tests.nix       |  1 +
 nixos/tests/buildkite-agent.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 nixos/tests/buildkite-agent.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ceeab2c21d92..eb69457fb7e9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -33,6 +33,7 @@ in
   bind = handleTest ./bind.nix {};
   bittorrent = handleTest ./bittorrent.nix {};
   #blivet = handleTest ./blivet.nix {};   # broken since 2017-07024
+  buildkite-agent = handleTest ./buildkite-agent.nix {};
   boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64
   boot-stage1 = handleTest ./boot-stage1.nix {};
   borgbackup = handleTest ./borgbackup.nix {};
diff --git a/nixos/tests/buildkite-agent.nix b/nixos/tests/buildkite-agent.nix
new file mode 100644
index 000000000000..042ce389eb8a
--- /dev/null
+++ b/nixos/tests/buildkite-agent.nix
@@ -0,0 +1,23 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+  name = "buildkite-agent";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ flokli ];
+  };
+
+  machine = { pkgs, ... }: {
+    services.buildkite-agent = {
+      enable = true;
+      privateSshKeyPath = (import ./ssh-keys.nix pkgs).snakeOilPrivateKey;
+      tokenPath = (pkgs.writeText "my-token" "5678");
+    };
+  };
+
+  testScript = ''
+    # we can't wait on the unit to start up, as we obviously can't connect to buildkite,
+    # but we can look whether files are set up correctly
+    machine.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg")
+    machine.wait_for_file("/var/lib/buildkite-agent/.ssh/id_rsa")
+  '';
+})

From 4b73d3c4441601c8e42063031c6bb0eaa0fec67e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Jan 2020 10:28:47 +0100
Subject: [PATCH 255/755] nixos/buildkite: make privateSshKeyPath optional

When only cloning public repos, or when the ssh key is provided by
different means, we don't need to manage it here.
---
 .../services/continuous-integration/buildkite-agent.nix    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 66f04b0a424b..418a7bc1a468 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -104,7 +104,8 @@ in
       };
 
       privateSshKeyPath = mkOption {
-        type = types.path;
+        type = types.nullOr types.path;
+        default = null;
         ## maximum care is taken so that secrets (ssh keys and the CI token)
         ## don't end up in the Nix store.
         apply = final: if final == null then null else toString final;
@@ -223,11 +224,11 @@ in
           sshDir = "${cfg.dataDir}/.ssh";
           tagStr = lib.concatStringsSep "," (lib.mapAttrsToList (name: value: "${name}=${value}") cfg.tags);
         in
-          ''
+          optionalString (cfg.privateSshKeyPath != null) ''
             mkdir -m 0700 -p "${sshDir}"
             cp -f "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa"
             chmod 600 "${sshDir}"/id_rsa
-
+          '' + ''
             cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
             token="$(cat ${toString cfg.tokenPath})"
             name="${cfg.name}"

From 7c4f84555148fa88f0c441b28447220e512657d9 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 29 Dec 2019 23:25:43 -0300
Subject: [PATCH 256/755] luckybackup: init at 0.5.0

---
 pkgs/tools/backup/luckybackup/default.nix | 45 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/backup/luckybackup/default.nix

diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix
new file mode 100644
index 000000000000..3e89be15391f
--- /dev/null
+++ b/pkgs/tools/backup/luckybackup/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl
+, pkgconfig, libtool, qmake
+, rsync, ssh
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  pname = "luckybackup";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz";
+    sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8";
+  };
+
+  buildInputs = [ rsync ssh ];
+
+  nativeBuildInputs = [ pkgconfig libtool qmake ];
+  
+  prePatch = ''
+    for File in luckybackup.pro menu/luckybackup-pkexec \
+        menu/luckybackup-su.desktop menu/luckybackup.desktop \
+        menu/net.luckybackup.su.policy src/functions.cpp \
+        src/global.cpp src/scheduleDialog.cpp; do
+      substituteInPlace $File --replace "/usr" "$out"
+    done
+  '';
+
+  meta = {
+    description = "A powerful, fast and reliable backup & sync tool";
+    longDescription = ''
+      luckyBackup is an application for data back-up and synchronization 
+      powered by the rsync tool.
+      
+      It is simple to use, fast (transfers over only changes made and not
+      all data), safe (keeps your data safe by checking all declared directories
+      before proceeding in any data manipulation), reliable and fully 
+      customizable.
+    '';
+    homepage = "http://luckybackup.sourceforge.net/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891e984a2482..9edf8ec45eea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2942,6 +2942,10 @@ in
 
   epubcheck = callPackage ../tools/text/epubcheck { };
 
+  luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup {
+    ssh = openssh;
+  };
+
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
   s-tar = callPackage ../tools/archivers/s-tar {};

From 489f823ac7aa6074a05ccde83ad335af31a51341 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Mon, 20 Jan 2020 11:43:41 +0100
Subject: [PATCH 257/755] gitlab-runner: 12.6.0 -> 12.7.0 (#78089)

---
 .../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 214e48b14b6d..91ef9d4a222d 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 = "12.6.0";
+  version = "12.7.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 = "14wp9dyacbldfvykc68pa0mj59anf0zfadxsr9bqwyl795zsxh7g";
+    sha256 = "0vaaaw6hxmr55kgcn86rim9in96zmyv0zhl7asr4b7qknabsjp4m";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "1iln85xy4qkz7ps2vr4qlbvn4p1b8137a75r4s24bc7g6apzyyvs";
+    sha256 = "031fv7f15wiqq7209n2ab7n3qzjf7cjzvbp4pkz24bkc3lr3y773";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "08vxgv6m83wqxksy0vj7nx6bb55sxn9c7l0sdpg0nblps0n8fzxm";
+    sha256 = "0f08syk7v7w89pcdbzwgscsxl54gnms1qd4spjppnq4h5r959jp2";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 0a1460f639ae47378b0e94a6cd36db35edebd855 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:23:59 +0100
Subject: [PATCH 258/755] serd: 0.30.0 -> 0.30.2

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

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index c390603c51da..63af0d40781d 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "serd";
-  version = "0.30.0";
+  version = "0.30.2";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
+    sha256 = "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx";
   };
 
   nativeBuildInputs = [ pkgconfig python3 wafHook ];

From 02e892c48dba5927fb4d7b84b50b7c1a885ea079 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:21:26 +0100
Subject: [PATCH 259/755] sratom: 0.6.2 -> 0.6.4

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

diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index d7353af0d3d3..840b50d788f9 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sratom";
-  version = "0.6.2";
+  version = "0.6.4";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
+    sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook python3 ];

From 216b47c4c1a62ae34878f8cbd8781bd24e6fd215 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Mon, 20 Jan 2020 13:03:39 +0100
Subject: [PATCH 260/755] python3Packages.solo-python: 0.0.21 -> 0.0.23

+ also fix for 78032
---
 pkgs/development/python-modules/solo-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 216e5a2a84f6..1b1896187f9d 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -3,7 +3,7 @@
 
  buildPythonPackage rec {
   pname = "solo-python";
-  version = "0.0.21";
+  version = "0.0.23";
   format = "flit";
   disabled = pythonOlder "3.6"; # only python>=3.6 is supported
 
@@ -11,7 +11,7 @@
     owner = "solokeys";
     repo = pname;
     rev = version;
-    sha256 = "07r451dp3ma1mh735b2kjv86a4jkjhmag70cjqf73z7b61dmzl1q";
+    sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f";
   };
 
   # replaced pinned fido, with unrestricted fido version

From 1d1a8fe7f1fa0deb1c3ee43abd432638196cde6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 07:24:05 +0000
Subject: [PATCH 261/755] focuswriter: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index b08e3b5fa23c..ccda1b4d4cbd 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "focuswriter";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "155wf7z1g2yx6fb41w29kcb0m2rhnk9ci5yw882yy86s4x20b1jq";
+    sha256 = "1fli85p9d58gsg2kwmncqdcw1nmx062kddbrhr50mnsn04dc4j3g";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From 70afd4e63bd33fde81b42e2aafb2834c4437f374 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 20 Jan 2020 13:43:45 +0100
Subject: [PATCH 262/755] zsh-you-should-use: 1.6.0 -> 1.7.0

https://github.com/MichaelAquilina/zsh-you-should-use/blob/1.7.0/CHANGELOG.md#170
---
 pkgs/shells/zsh/zsh-you-should-use/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix
index becc4c57e4bb..91cf34268acd 100644
--- a/pkgs/shells/zsh/zsh-you-should-use/default.nix
+++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zsh-you-should-use";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "MichaelAquilina";
     repo = pname;
     rev = version;
-    sha256 = "1xzq7xmmx4rg53pd69d0s9n561q4z35hlbb2sq2xd76gk3x6fars";
+    sha256 = "1gcxm08ragwrh242ahlq3bpfg5yma2cshwdlj8nrwnd4qwrsflgq";
   };
 
   dontBuild = true;

From d9e2bcb21dc0f6c9995f6526e1e7f3098195f3e5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 20 Jan 2020 07:47:08 -0500
Subject: [PATCH 263/755] linux: 5.5-rc6 -> 5.5-rc7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index b6231b5a9729..00dcb6f0f488 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5-rc6";
+  version = "5.5-rc7";
   extraMeta.branch = "5.5";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0y4rsxynn0qprrsxy4v5vr4ihhavn43yqqp1qfrrxsfw15djncc2";
+    sha256 = "10fjk4bw73x5xpb4q83ngni7slw489wdxhdwmyrkfqqy5chgm290";
   };
 
   # Should the testing kernels ever be built on Hydra?

From d0a3a800c8b28ab1a52f793dabecd65d82baf9d5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sun, 19 Jan 2020 23:55:03 +0000
Subject: [PATCH 264/755] xss-lock: use fork with session param support

xss-lock uses current session that cannot be overriden. This prevents starting
xss-lock as systemd user service, as described here:
https://bitbucket.org/raymonad/xss-lock/issues/13/allow-operation-as-systemd-user-unit

This change uses source from github.com/xdbob/xss-lock that adds `--session`
parameter.
---
 pkgs/misc/screensavers/xss-lock/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index 500f7a9c5a3f..b7b0e27ad46b 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, cmake, docutils, pkgconfig, glib, libpthreadstubs
+{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs
 , libXau, libXdmcp, xcbutil }:
 
 stdenv.mkDerivation {
-  name = "xss-lock-git-2014-03-02";
+  name = "xss-lock-git-2018-05-31";
 
-  src = fetchgit {
-    url = https://bitbucket.org/raymonad/xss-lock.git;
-    rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
-    sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r";
+  src = fetchFromGitHub {
+    owner = "xdbob";
+    repo = "xss-lock";
+    rev = "cd0b89df9bac1880ea6ea830251c6b4492d505a5";
+    sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Use external locker (such as i3lock) as X screen saver";
     license = licenses.mit;
-    maintainers = with maintainers; [ malyn ];
+    maintainers = with maintainers; [ malyn offline ];
     platforms = platforms.linux;
   };
 }

From 1e4c3f8dc82292df1337e5283c67d7d9edf44558 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Mon, 20 Jan 2020 15:52:26 +0200
Subject: [PATCH 265/755] thicket: init at 0.1.3

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/thicket/default.nix         | 26 +++++++++++++++++++
 .../git-and-tools/thicket/shards.nix          |  8 ++++++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/thicket/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/thicket/shards.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d57ffd75d7f2..9d638c70f927 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -174,6 +174,8 @@ let
 
   svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
 
+  thicket = callPackage ./thicket { };
+
   tig = callPackage ./tig { };
 
   topGit = callPackage ./topgit { };
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
new file mode 100644
index 000000000000..42819043d58b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchFromGitHub
+, crystal
+}:
+
+crystal.buildCrystalPackage rec {
+  pname = "thicket";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "taylorthurlow";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw";
+  };
+
+  shardsFile = ./shards.nix;
+  crystalBinaries.thicket.src = "src/thicket.cr";
+
+  meta = with lib; {
+    description = "A better one-line git log";
+    homepage = "https://github.com/taylorthurlow/thicket";
+    license = licenses.mit;
+    maintainers = with maintainers; [ filalex77 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
new file mode 100644
index 000000000000..c8839651a26d
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix
@@ -0,0 +1,8 @@
+{
+  ameba = {
+    owner = "veelenga";
+    repo = "ameba";
+    rev = "v0.10.0";
+    sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";
+  };
+}

From 96d2790061f6d34af01b7dde5f17662305d87946 Mon Sep 17 00:00:00 2001
From: "Ian M. Jones" <ian@ianmjones.com>
Date: Fri, 17 Jan 2020 00:22:57 +0000
Subject: [PATCH 266/755] onedrive: 2.3.12 -> 2.3.13

---
 .../networking/sync/onedrive/default.nix      | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
index dc38debd3050..636761d2aaff 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -1,35 +1,27 @@
-{ stdenv
-, fetchFromGitHub
-, dmd
-, pkgconfig
-, curl
-, sqlite
-}:
+{ stdenv, fetchFromGitHub, dmd, pkgconfig, curl, sqlite, libnotify }:
 
 stdenv.mkDerivation rec {
   pname = "onedrive";
-  version = "2.3.12";
+  version = "2.3.13";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
-    repo = "onedrive";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "0605nb3blvnncjx09frg2liarrd6pw8ph5jhnh764qcx0hyxcgs6";
+    sha256 = "0bcsrfh1g7bdlcp0zjn6np88qzpn5frv61lzxz9b2ayxf7wyybvi";
   };
 
-  nativeBuildInputs = [
-    dmd
-    pkgconfig
-  ];
-  buildInputs = [
-    curl
-    sqlite
-  ];
+  nativeBuildInputs = [ dmd pkgconfig ];
+
+  buildInputs = [ curl sqlite libnotify ];
+
+  configureFlags = [ "--enable-notifications" ];
+
   meta = with stdenv.lib; {
     description = "A complete tool to interact with OneDrive on Linux";
     homepage = "https://github.com/abraunegg/onedrive";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ doronbehar srgom ];
+    maintainers = with maintainers; [ srgom ianmjones ];
     platforms = platforms.linux;
   };
 }

From 89d1275c38d367201f0949842e12fbd07c4a9ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Jan 2020 23:27:37 +0000
Subject: [PATCH 267/755] python.pkgs.pyicloud: init at 0.9.1

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

diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
new file mode 100644
index 000000000000..50dd1a09890f
--- /dev/null
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, keyring
+, keyrings-alt
+, click
+, six
+, tzlocal
+, certifi
+, bitstring
+, unittest2
+}:
+
+buildPythonPackage rec {
+  pname = "pyicloud";
+  version = "0.9.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "580b52e95f67a41ed86c56a514aa2b362f53fbaf23f16c69fb24e0d19fd373ee";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    keyring
+    keyrings-alt
+    click
+    six
+    tzlocal
+    certifi
+    bitstring
+  ];
+
+  checkInputs = [ unittest2 ];
+
+  postPatch = ''
+    sed -i \
+      -e 's!click>=6.0,<7.0!click!' \
+      -e 's!keyring>=8.0,<9.0!keyring!' \
+      -e 's!keyrings.alt>=1.0,<2.0!keyrings.alt!' \
+      requirements.txt
+  '';
+
+  meta = with lib; {
+    description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices";
+    homepage = https://github.com/picklepete/pyicloud;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1e854b007ed..b596d1ebdae3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -944,6 +944,8 @@ in {
 
   pdfx = callPackage ../development/python-modules/pdfx { };
 
+  pyicloud = callPackage ../development/python-modules/pyicloud { };
+
   pyperf = callPackage ../development/python-modules/pyperf { };
 
   pefile = callPackage ../development/python-modules/pefile { };

From 17a3674aadf738768c26d114e46bc50f5e38bb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Jan 2020 23:29:34 +0000
Subject: [PATCH 268/755] home-assistant: regenerate to include icloud

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index ebb6192fa6aa..275241fcd176 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -339,7 +339,7 @@
     "hyperion" = ps: with ps; [  ];
     "ialarm" = ps: with ps; [  ];
     "iaqualink" = ps: with ps; [  ];
-    "icloud" = ps: with ps; [  ];
+    "icloud" = ps: with ps; [ pyicloud ];
     "idteck_prox" = ps: with ps; [  ];
     "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
     "iglo" = ps: with ps; [  ];

From 89b311fa4d97da37b773985012488e91e687b78d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 20 Oct 2019 02:23:53 +0000
Subject: [PATCH 269/755] mailman: remove unused derivation for mailman 2

This isn't referenced anywhere, so it's just dead code.
---
 pkgs/servers/mail/mailman/default.nix | 33 ---------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 pkgs/servers/mail/mailman/default.nix

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
deleted file mode 100644
index e9f66b92be29..000000000000
--- a/pkgs/servers/mail/mailman/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, python2 }:
-
-stdenv.mkDerivation rec {
-  pname = "mailman";
-  version = "2.1.29";
-
-  src = fetchurl {
-    url = "mirror://gnu/mailman/${pname}-${version}.tgz";
-    sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
-  };
-
-  buildInputs = [ python2 python2.pkgs.dnspython ];
-
-  patches = [ ./fix-var-prefix.patch ];
-
-  configureFlags = [
-    "--without-permcheck"
-    "--with-cgi-ext=.cgi"
-    "--with-var-prefix=/var/lib/mailman"
-  ];
-
-  installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
-
-  makeFlags = [ "DIRSETGID=:" ];
-
-  meta = {
-    homepage = https://www.gnu.org/software/mailman/;
-    description = "Free software for managing electronic mail discussion and e-newsletter lists";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.peti ];
-  };
-}

From 0b9bfc01322dc44cfd344afb5c019acc11aa6936 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 20 Oct 2019 02:26:14 +0000
Subject: [PATCH 270/755] python3.pkgs.mailman: core.nix -> default.nix

The actual upstream "mailman" name just refers to this, so we should
use the Nixpkgs convention of default.nix.
---
 pkgs/servers/mail/mailman/{core.nix => default.nix} | 0
 pkgs/top-level/python-packages.nix                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/mail/mailman/{core.nix => default.nix} (100%)

diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/default.nix
similarity index 100%
rename from pkgs/servers/mail/mailman/core.nix
rename to pkgs/servers/mail/mailman/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1e854b007ed..dc0727594c2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -817,7 +817,7 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
-  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { });
+  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { });
 
   mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
 

From 38f2103de9fd65f4656d50847783a0c5170b4201 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 16 Dec 2019 19:06:10 +0100
Subject: [PATCH 271/755] python3.pkgs.hyperkitty: 1.2.2 -> 1.3.2

---
 pkgs/servers/mail/mailman/hyperkitty.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index 8f060da34461..758433ba3a43 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,25 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, coverage, mock
+{ stdenv, buildPythonPackage, fetchPypi, isort, coverage, mock
 , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
-, django-haystack, lockfile, networkx, dateutil, defusedxml
+, django-haystack, flufl_lock, networkx, dateutil, defusedxml
 , django-paintstore, djangorestframework, django, django-q
-, django_compressor, beautifulsoup4, six, psycopg2, whoosh
+, django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch
 }:
 
 buildPythonPackage rec {
   pname = "HyperKitty";
-  version = "1.2.2";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz";
+    sha256 = "092fkv0xyf5vgj33xwq0mh9h5c5d56ifwimaqbfpx5cwc6yivb88";
   };
 
+  nativeBuildInputs = [ isort ];
   buildInputs = [ coverage mock ];
   propagatedBuildInputs = [
     robot-detection django_extensions rjsmin cssmin django-mailman3
-    django-haystack lockfile networkx dateutil defusedxml
+    django-haystack flufl_lock networkx dateutil defusedxml
     django-paintstore djangorestframework django django-q
-    django_compressor beautifulsoup4 six psycopg2 whoosh
+    django_compressor beautifulsoup4 six psycopg2 whoosh isort elasticsearch
   ];
 
   checkPhase = ''

From 6af4de84d3a487ce3c0c00e857958859263acc8c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 17 Jan 2020 01:57:13 +0000
Subject: [PATCH 272/755] python3.pkgs.hyperkitty: use checkInputs

The previously propagated build inputs are optional, and so are
included in checkInputs so the tests can run, but not propagated so
they aren't included if unneeded.
---
 pkgs/servers/mail/mailman/hyperkitty.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index 758433ba3a43..7e696f6d27fa 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -15,14 +15,19 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ isort ];
-  buildInputs = [ coverage mock ];
   propagatedBuildInputs = [
     robot-detection django_extensions rjsmin cssmin django-mailman3
     django-haystack flufl_lock networkx dateutil defusedxml
     django-paintstore djangorestframework django django-q
-    django_compressor beautifulsoup4 six psycopg2 whoosh isort elasticsearch
+    django_compressor six psycopg2 isort
   ];
 
+  # Some of these are optional runtime dependencies that are not
+  # listed as dependencies in setup.py.  To use these, they should be
+  # dependencies of the Django Python environment, but not of
+  # HyperKitty so they're not included for people who don't need them.
+  checkInputs = [ beautifulsoup4 coverage elasticsearch mock whoosh ];
+
   checkPhase = ''
     cd $NIX_BUILD_TOP/$sourceRoot
     PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \

From 9a43cdc1c64be351b8da4328283c1a89e8e387e7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 17 Jan 2020 02:02:51 +0000
Subject: [PATCH 273/755] python3.pkgs.postorius: use checkInputs

---
 pkgs/servers/mail/mailman/postorius.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index 871f2ea244dd..e2e729b6e670 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -11,8 +11,8 @@ buildPythonPackage rec {
     sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl";
   };
 
-  buildInputs = [ beautifulsoup4 vcrpy mock ];
   propagatedBuildInputs = [ django-mailman3 ];
+  checkInputs = [ beautifulsoup4 vcrpy mock ];
 
   checkPhase = ''
     cd $NIX_BUILD_TOP/$sourceRoot

From aec2382b38928095a6441df895d07ac800615afb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 17 Jan 2020 02:22:28 +0000
Subject: [PATCH 274/755] python3.pkgs.postorius: 1.2.4 -> 1.3.2

---
 pkgs/servers/mail/mailman/postorius.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index e2e729b6e670..bcb92051fc8a 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -1,23 +1,21 @@
 { stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
-, django-mailman3, mailmanclient
+, django-mailman3, mailmanclient, readme_renderer
 }:
 
 buildPythonPackage rec {
   pname = "postorius";
-  version = "1.2.4";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl";
+    sha256 = "0wrm0hda7ym9qaygxirqaaii66ndmgyy7gx8wqdg07pfx14zcyja";
   };
 
-  propagatedBuildInputs = [ django-mailman3 ];
+  propagatedBuildInputs = [ django-mailman3 readme_renderer ];
   checkInputs = [ beautifulsoup4 vcrpy mock ];
 
-  checkPhase = ''
-    cd $NIX_BUILD_TOP/$sourceRoot
-    PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius
-  '';
+  # Tries to connect to database.
+  doCheck = false;
 
   meta = {
     homepage = https://www.gnu.org/software/mailman/;

From fed58178680a64e86381f43e442a84387bc103da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2019 19:14:29 +0100
Subject: [PATCH 275/755] python3.pkgs.authheaders: init at 0.12.1

This package is a dependency of GNU Mailman 3.3.x.

Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
---
 .../python-modules/authheaders/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/authheaders/default.nix

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
new file mode 100644
index 000000000000..fdb478bc143b
--- /dev/null
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, isPy27, lib
+, authres, dnspython, dkimpy, ipaddress, publicsuffix
+}:
+
+buildPythonPackage rec {
+  pname = "authheaders";
+  version = "0.12.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hf1p6ws3jma608pmcb5qsl58xg33wz2s51qqzi9zix0llcnyc97";
+  };
+
+  propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix ]
+                          ++ lib.optional isPy27 ipaddress;
+
+  meta = {
+    description = "Python library for the generation of email authentication headers";
+    homepage = https://github.com/ValiMail/authentication-headers;
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc0727594c2c..f4110e96f3d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -224,6 +224,8 @@ in {
     inherit (pkgs) augeas;
   };
 
+  authheaders = callPackage ../development/python-modules/authheaders { };
+
   authres = callPackage ../development/python-modules/authres { };
 
   autograd = callPackage ../development/python-modules/autograd { };

From 3e2664035255e79c30bf99d82dc0a104e229f2fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2019 19:15:32 +0100
Subject: [PATCH 276/755] python3.pkgs.mailman: 3.2.2 -> 3.3.0

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

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 1ba220039ea9..4c5d56341a06 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,22 +1,22 @@
 { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
 , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
 , requests, zope_configuration, click, falcon, importlib-resources
-, zope_component, lynx, postfix
+, zope_component, lynx, postfix, authheaders, gunicorn
 }:
 
 buildPythonPackage rec {
   pname = "mailman";
-  version = "3.2.2";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6";
+    sha256 = "1qph9i93ndahfxi3bb2sd0kjm2c0pkh844ai6zacfmvihl1k3pvy";
   };
 
   propagatedBuildInputs = [
     alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock
     importlib-resources lazr_config passlib requests zope_configuration
-    zope_component
+    zope_component authheaders gunicorn
   ];
 
   patchPhase = ''

From 126ff4d97eb14cce20248c8399a122984ffb2c9a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Jan 2020 20:19:14 +0000
Subject: [PATCH 277/755] python3.pkgs.mailman*: check isPy3k inside package

---
 pkgs/development/python-modules/mailmanclient/default.nix | 3 ++-
 pkgs/servers/mail/mailman/default.nix                     | 3 ++-
 pkgs/servers/mail/mailman/hyperkitty.nix                  | 3 ++-
 pkgs/servers/mail/mailman/web.nix                         | 3 ++-
 pkgs/top-level/python-packages.nix                        | 8 ++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix
index 9fe9adbe6cfd..e6233de93d12 100644
--- a/pkgs/development/python-modules/mailmanclient/default.nix
+++ b/pkgs/development/python-modules/mailmanclient/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, httplib2, requests }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:
 
 buildPythonPackage rec {
   pname = "mailmanclient";
   version = "3.3.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 4c5d56341a06..8e763800f650 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython
 , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
 , requests, zope_configuration, click, falcon, importlib-resources
 , zope_component, lynx, postfix, authheaders, gunicorn
@@ -7,6 +7,7 @@
 buildPythonPackage rec {
   pname = "mailman";
   version = "3.3.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index 7e696f6d27fa..fedd6c9f7593 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isort, coverage, mock
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock
 , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
 , django-haystack, flufl_lock, networkx, dateutil, defusedxml
 , django-paintstore, djangorestframework, django, django-q
@@ -8,6 +8,7 @@
 buildPythonPackage rec {
   pname = "HyperKitty";
   version = "1.3.2";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix
index b0ead765a605..ec16775b1d45 100644
--- a/pkgs/servers/mail/mailman/web.nix
+++ b/pkgs/servers/mail/mailman/web.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, hyperkitty, postorius, buildPythonPackage
+{ stdenv, python, hyperkitty, postorius, buildPythonPackage, isPy3k
 , serverEMail ? "postmaster@example.org"
 , archiverKey ? "SecretArchiverAPIKey"
 , allowedHosts ? []
@@ -17,6 +17,7 @@ in
 
 buildPythonPackage {
   name = "mailman-web-0";
+  disabled = !isPy3k;
 
   propagatedBuildInputs = [ hyperkitty postorius ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4110e96f3d4..c14028bae9dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -819,11 +819,11 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
-  mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman { });
+  mailman = callPackage ../servers/mail/mailman { };
 
-  mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
+  mailman-web = callPackage ../servers/mail/mailman/web.nix { };
 
-  mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { });
+  mailmanclient = callPackage ../development/python-modules/mailmanclient { };
 
   mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
 
@@ -3055,7 +3055,7 @@ in {
 
   sunpy = callPackage ../development/python-modules/sunpy { };
 
-  hyperkitty = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/hyperkitty.nix { });
+  hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { };
 
   robot-detection = callPackage ../development/python-modules/robot-detection {};
 

From 79cf2c25fb78ccceaaa63c48a604dd629b2e91c7 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noah@noahloomans.com>
Date: Sun, 19 Jan 2020 22:07:26 +0100
Subject: [PATCH 278/755] hakuneko: 5.0.8 -> 6.1.7

---
 pkgs/tools/misc/hakuneko/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 0a27397551d9..34405ccc7bea 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -21,16 +21,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "hakuneko";
-  version = "5.0.8";
+  version = "6.1.7";
 
   src = {
     "x86_64-linux" = fetchurl {
       url = "https://github.com/manga-download/hakuneko/releases/download/v${version}/hakuneko-desktop_${version}_linux_amd64.deb";
-      sha256 = "924df1d7a0ab54b918529165317e4428b423c9045548d1e36bd634914f7957f0";
+      sha256 = "06bb17d7a06bb0601053eaaf423f9176f06ff3636cc43ffc024438e1962dcd02";
     };
     "i686-linux" = fetchurl {
       url = "https://github.com/manga-download/hakuneko/releases/download/v${version}/hakuneko-desktop_${version}_linux_i386.deb";
-      sha256 = "988d8b0e8447dcd0a8d85927f5877bca9efb8e4b09ed3c80a6788390e54a48d2";
+      sha256 = "32017d26bafffaaf0a83dd6954d3926557014af4022a972371169c56c0e3d98b";
     };
   }."${stdenv.hostPlatform.system}";
 

From 7106ae143e59944a200cdb2ef699f6212846a8a8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Mon, 20 Jan 2020 13:29:09 +0100
Subject: [PATCH 279/755] vimPlugins.deoplete-notmuch: init at 2018-12-11

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a5e420eadbaf..f6a83ff7d82d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -998,6 +998,17 @@ let
     };
   };
 
+  deoplete-notmuch = buildVimPluginFrom2Nix {
+    pname = "deoplete-notmuch";
+    version = "2018-12-11";
+    src = fetchFromGitHub {
+      owner = "Valodim";
+      repo = "deoplete-notmuch";
+      rev = "828b5acf1924f9869614e93855a0d8cc94f1a74d";
+      sha256 = "1l2pfazhpkz26zwbjdafvhgvjj533kncm7dywlandsf3cibm8mv9";
+    };
+  };
+
   deoplete-rust = buildVimPluginFrom2Nix {
     pname = "deoplete-rust";
     version = "2017-07-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cb2eebf5ea39..f842232bb875 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -485,6 +485,7 @@ uarun/vim-protobuf
 udalov/kotlin-vim
 ujihisa/neco-look
 unblevable/quick-scope
+Valodim/deoplete-notmuch
 valloric/youcompleteme
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline

From 7de77b68a0a940102995e45045ea033c9a89b620 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Mon, 20 Jan 2020 13:30:33 +0100
Subject: [PATCH 280/755] vimPlugins.vim-sandwich: init at 2019-12-06

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f6a83ff7d82d..623cc6bb8e59 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5008,6 +5008,17 @@ let
     };
   };
 
+  vim-sandwich = buildVimPluginFrom2Nix {
+    pname = "vim-sandwich";
+    version = "2019-12-06";
+    src = fetchFromGitHub {
+      owner = "machakann";
+      repo = "vim-sandwich";
+      rev = "a0cde9cfb20d9aff10a09b7fc776231f7856abef";
+      sha256 = "0dzrzz9ngprh2zd3wnnbr9qcs7ilgchadw4l39ncny6x43fk2ckd";
+    };
+  };
+
   vim-sayonara = buildVimPluginFrom2Nix {
     pname = "vim-sayonara";
     version = "2017-03-13";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f842232bb875..595690d6e23d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -223,6 +223,7 @@ luochen1990/rainbow
 lyokha/vim-xkbswitch
 machakann/vim-highlightedyank
 machakann/vim-swap
+machakann/vim-sandwich
 majutsushi/tagbar
 maksimr/vim-jsbeautify
 MarcWeber/vim-addon-actions

From 631d225cd1b9109dbb7d0ede0d92569d609f58a6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Mon, 20 Jan 2020 13:31:49 +0100
Subject: [PATCH 281/755] vimPlugins.vim-indentwise: init a 2015-06-07

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 623cc6bb8e59..bd829998b5b0 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4215,6 +4215,17 @@ let
     };
   };
 
+  vim-indentwise = buildVimPluginFrom2Nix {
+    pname = "vim-indentwise";
+    version = "2015-06-07";
+    src = fetchFromGitHub {
+      owner = "jeetsukumaran";
+      repo = "vim-indentwise";
+      rev = "608bd6876d3b56d469e0e615eb774a6e06095dbf";
+      sha256 = "0bnzk1afi88icq58389nxqz196gkxcj71qrxvw87d72h2zaspvcx";
+    };
+  };
+
   vim-indexed-search = buildVimPluginFrom2Nix {
     pname = "vim-indexed-search";
     version = "2019-07-04";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 595690d6e23d..37019541caa9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -147,6 +147,7 @@ JazzCore/ctrlp-cmatcher
 jceb/vim-hier
 jceb/vim-orgmode
 jeetsukumaran/vim-buffergator
+jeetsukumaran/vim-indentwise
 jeffkreeftmeijer/neovim-sensible
 jelera/vim-javascript-syntax
 jgdavey/tslime.vim

From 233c2788f393f67aaa4d9e4fa90bd41c280e2613 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 13:49:33 +0100
Subject: [PATCH 282/755] i3-layout-manager: unstable-2019-06-19 ->
 unstable-2019-12-06

---
 pkgs/applications/window-managers/i3/layout-manager.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
index 85d103e172aa..c7454981400d 100644
--- a/pkgs/applications/window-managers/i3/layout-manager.nix
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "i3-layout-manager";
-  version = "unstable-2019-06-19";
+  version = "unstable-2019-12-06";
 
   src = fetchFromGitHub {
     owner = "klaxalk";
     repo = pname;
-    rev = "80ade872bfd70d9c6039024097ceb8c852a2816a";
-    sha256 = "02xhyd737qwni628mjzr9i5v2kga5cq4k8m77bxm1p6kkj84nlmg";
+    rev = "064e13959413ba2d706185478a394e5852c0dc53";
+    sha256 = "1qm35sp1cfi3xj5j7xwa05dkb3353gwq4xh69ryc6382xx3wszg6";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6803c951a7d5250fc25002c63977dbd725b6bac5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:16:43 +0100
Subject: [PATCH 283/755] lilv: 0.24.4 -> 0.24.6

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 8d429987ad8d..44be67d71b4e 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lilv";
-  version = "0.24.4";
+  version = "0.24.6";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
+    sha256 = "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z";
   };
 
   nativeBuildInputs = [ pkgconfig python3 wafHook ];

From 865b4620ed5e42a2c1879cc7c4e1a9a149143436 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Sun, 19 Jan 2020 22:37:37 +0000
Subject: [PATCH 284/755] rofi-mpd: 1.1.0 -> 2.0.0

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

diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix
index 9def4a292f61..c3654c00acf3 100644
--- a/pkgs/applications/audio/rofi-mpd/default.nix
+++ b/pkgs/applications/audio/rofi-mpd/default.nix
@@ -2,16 +2,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rofi-mpd";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "Rofi_MPD";
     rev = "v${version}";
-    sha256 = "0pdra1idgas3yl9z9v7b002igwg2c1mv0yw2ffb8rsbx88x4gbai";
+    sha256 = "0qn2jwvil5csp423r523wjbgwpb781li2bgaz1mby3prscrlz8mg";
   };
 
-  propagatedBuildInputs = with python3Packages; [ mutagen mpd2 ];
+  propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ];
 
   # upstream doesn't contain a test suite
   doCheck = false;

From 7c2a51cdf1f74345ce826b5e59b02d5af524ca89 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 19 Jan 2020 04:20:00 -0500
Subject: [PATCH 285/755] du-dust: 0.4.2 -> 0.4.4

---
 pkgs/tools/misc/dust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index 4239b54f18e7..caa8451585e7 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dust";
-  version = "0.4.2";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     rev = "v${version}";
-    sha256 = "0z1vi5agaf1gcq1bdzgfc89v6vpk9kaxxy8f3rd2h6yzdrd2dhk7";
+    sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7";
   };
 
-  cargoSha256 = "08c428rrana0llzhkg8ngzqs6vc773jrf4wql2qxdvm4l0nsx596";
+  cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a";
 
   doCheck = false;
 

From 7450bb75c0b7552cdd25652aedfaae911a655a6f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:22:20 +0100
Subject: [PATCH 286/755] ganv: unstable-2016-10-15 -> unstable-2019-12-30

---
 pkgs/development/libraries/ganv/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 58356f0bc676..a883b2c1d10c 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "ganv-unstable-${rev}";
-  rev = "2016-10-15";
+  pname = "ganv";
+  version = "unstable-2019-12-30";
 
   src = fetchgit {
-    url = "http://git.drobilla.net/cgit.cgi/ganv.git";
-    rev = "31685d283e9b811b61014f820c42807f4effa071";
-    sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56";
+    url = "https://gitlab.com/drobilla/${pname}.git";
+    fetchSubmodules = true;
+    rev = "90bd022f8909f92cc5290fdcfc76c626749e1186";
+    sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];
@@ -20,4 +21,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
   };
-}
+  }

From a6ecbc4443d5cd2a162b51e1209c82a40cbd237c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:14:03 +0100
Subject: [PATCH 287/755] ingen: unstable-2017-07-22 unstable-2019-12-09

---
 pkgs/applications/audio/ingen/default.nix     | 17 +++++++-------
 .../libraries/audio/lv2/unstable.nix          | 23 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/audio/lv2/unstable.nix

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 1e249b51fb76..9d3fb6aae40b 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,23 +1,24 @@
 { stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
-, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
 , wafHook
 , suil
 }:
 
 stdenv.mkDerivation  rec {
-  name = "ingen-unstable-${rev}";
-  rev = "2017-07-22";
+  pname = "ingen";
+  version = "unstable-2019-12-09";
+  name = "${pname}-${version}";
 
   src = fetchgit {
-    url = "https://git.drobilla.net/cgit.cgi/ingen.git";
-    rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3";
-    sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w";
+    url = "https://gitlab.com/drobilla/ingen.git";
+    rev = "e32f32a360f2bf8f017ea347b6d1e568c0beaf68";
+    sha256 = "0wjn2i3j7jb0bmxymg079xpk4iplb91q0xqqnvnpvyldrr7gawlb";
     deepClone = true;
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];
   buildInputs = [
-    boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper
+    boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
     python raul serd sord sratom suil
   ];
 
@@ -38,7 +39,7 @@ stdenv.mkDerivation  rec {
   meta = with stdenv.lib; {
     description = "A modular audio processing system using JACK and LV2 or LADSPA plugins";
     homepage = http://drobilla.net/software/ingen;
-    license = licenses.gpl3;
+    license = licenses.agpl3Plus;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
deleted file mode 100644
index 6f10283b07bf..000000000000
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
-
-stdenv.mkDerivation {
-  pname = "lv2-unstable";
-  version = "2017-07-08";
-
-  src = fetchgit {
-    url = "http://lv2plug.in/git/cgit.cgi/lv2.git";
-    rev = "39c7c726cd52b2863fcea356cafe1bcab2ba7f37";
-    sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r";
-  };
-
-  nativeBuildInputs = [ pkgconfig wafHook ];
-  buildInputs = [ gtk2 libsndfile python ];
-
-  meta = with stdenv.lib; {
-    homepage = http://lv2plug.in;
-    description = "A plugin standard for audio systems";
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bb7da688439..ee74eb17f311 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14017,7 +14017,6 @@ in
   lilv = callPackage ../development/libraries/audio/lilv { };
 
   lv2 = callPackage ../development/libraries/audio/lv2 { };
-  lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { };
 
   lvtk = callPackage ../development/libraries/audio/lvtk { };
 

From bb04c6dc0726f45f4f9f88d689db154c598d38c6 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:19:16 +0100
Subject: [PATCH 288/755] raul: unstable-2017-07-23 -> unstable-2019-12-09

---
 pkgs/development/libraries/audio/raul/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 51234a415fd7..de78385e0ab3 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
 
 stdenv.mkDerivation rec {
-  name = "raul-unstable-${rev}";
-  rev = "2017-07-23";
+  pname = "raul";
+  version = "unstable-2019-12-09";
+  name = "${pname}-${version}";
 
   src = fetchgit {
-    url = "http://git.drobilla.net/cgit.cgi/raul.git";
-    rev = "4db870b2b20b0a608ec0283139056b836c5b1624";
-    sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr";
+    url = "https://gitlab.com/drobilla/raul.git";
+    fetchSubmodules = true;
+    rev = "e87bb398f025912fb989a09f1450b838b251aea1";
+    sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];

From 50c3ac29ac04b79f3ff290ece687a767a6944b81 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 19 Jul 2019 17:56:52 +0200
Subject: [PATCH 289/755] suil: 0.10.0 -> 0.10.6

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

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 10d650d66425..8bd460ce5454 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -9,12 +9,12 @@ assert !(withQt4 && withQt5);
 
 stdenv.mkDerivation rec {
   pname = "suil";
-  version = "0.10.0";
+  version = "0.10.6";
   name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq";
+    sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];

From bd5a5968682f5d9d4953219d2d92cfb96add9c06 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Jan 2020 16:57:57 +0100
Subject: [PATCH 290/755] ocaml-ng.ocamlPackages_4_10.ocaml: init at
 4.10.0+beta1

---
 pkgs/development/compilers/ocaml/4.10.nix | 6 ++++++
 pkgs/top-level/ocaml-packages.nix         | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 pkgs/development/compilers/ocaml/4.10.nix

diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
new file mode 100644
index 000000000000..6f78ae05e02e
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -0,0 +1,6 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "10";
+  patch_version = "0+beta1";
+  sha256 = "18jrgww98v1famb2x5jhbsnm4ngph2rvq0z4cxpqxfn06yb53jyf";
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4d956c494c05..a1d2e8eb3b51 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1232,6 +1232,8 @@ in let inherit (pkgs) callPackage; in rec
 
   ocamlPackages_4_09 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.09.nix { });
 
+  ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { });
+
   ocamlPackages_latest = ocamlPackages_4_09;
 
   ocamlPackages = ocamlPackages_4_07;

From 267c5332e73475fbb385c8550ce58d8958b5358a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Jan 2020 11:15:40 +0100
Subject: [PATCH 291/755] jalv: 1.6.2 -> 1.6.4

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

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index a40d5101b34f..51ec102dbfd2 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
+{ stdenv, fetchurl, gtk3, libjack2, lilv, lv2, pkgconfig, python
 , serd, sord , sratom, suil, wafHook }:
 
 stdenv.mkDerivation  rec {
   pname = "jalv";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa";
+    sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];
   buildInputs = [
-    gtk2 libjack2 lilv lv2 python serd sord sratom suil
+    gtk3 libjack2 lilv lv2 python serd sord sratom suil
   ];
 
   meta = with stdenv.lib; {

From d1e502ba7e3b4747993a5d1cd6a53302727441e1 Mon Sep 17 00:00:00 2001
From: Serg Nesterov <i.am.cust0dian@gmail.com>
Date: Mon, 20 Jan 2020 19:59:53 +0300
Subject: [PATCH 292/755] tmuxinator: 1.1.0 -> 1.1.4

---
 pkgs/tools/misc/tmuxinator/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index ab2edf7be4e8..b7c9150e12d7 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "1.1.0";
-  source.sha256 = "9f4a4fd0242c82844f9af109d2c03b6870060d7e30603e6d9bd017aee5380ec0";
+  version = "1.1.4";
+  source.sha256 = "06ajfvsmq2040b7nk2ifih3sqxgwzih5j1d25nh4ilgjlrfmha98";
 
   erubis = buildRubyGem rec {
     inherit ruby;
@@ -23,16 +23,16 @@ buildRubyGem rec {
     inherit ruby;
     name = "ruby${ruby.version}-${gemName}-${version}";
     gemName = "thor";
-    version = "0.20.0";
-    source.sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
+    version = "1.0.1";
+    source.sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
   };
 
   xdg = buildRubyGem rec {
     inherit ruby;
     name = "ruby${ruby.version}-${gemName}-${version}";
     gemName = "xdg";
-    version = "2.2.3";
-    source.sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq";
+    version = "2.2.5";
+    source.sha256 = "04xr4cavnzxlk926pkji7b5yiqy4qsd3gdvv8mg6jliq6sczg9gk";
   };
 
   propagatedBuildInputs = [ erubis thor xdg ];

From 5540b2e7b41c375d56db6b3180b09d9607e7c05b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 20 Jan 2020 18:11:00 +0000
Subject: [PATCH 293/755] perl.withPackages: respect $PERL5LIB

perl.withPackages did not allow to add more packages using $PERL5LIB
---
 pkgs/development/interpreters/perl/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 95122aebf039..2e3d394f8515 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -35,7 +35,7 @@ let
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
               if [ -x "$prg" ]; then
-                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PERL5LIB "$out/${perl.libPrefix}"
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix PERL5LIB ':' "$out/${perl.libPrefix}"
               fi
             fi
           done

From ef7fc3f71b44398c9d42a6581e6895e7a5d5c004 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Mon, 20 Jan 2020 18:22:12 +0000
Subject: [PATCH 294/755] rofi-mpd: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix
index c3654c00acf3..97c737675ad8 100644
--- a/pkgs/applications/audio/rofi-mpd/default.nix
+++ b/pkgs/applications/audio/rofi-mpd/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rofi-mpd";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "Rofi_MPD";
     rev = "v${version}";
-    sha256 = "0qn2jwvil5csp423r523wjbgwpb781li2bgaz1mby3prscrlz8mg";
+    sha256 = "12zzx0m2nwyzxzzqgzq30a27k015kcw4ylvs7cyalf5gf6sg27kl";
   };
 
   propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ];

From 67ce294be2333042d275f48f44734faf07339882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 19:22:22 +0100
Subject: [PATCH 295/755] cinnamon.cjs: add nma for nma typelib

---
 pkgs/desktops/cinnamon/cjs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index 7d9ba7cc438e..a240f670be00 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -17,6 +17,7 @@
 , libffi
 , gtk3
 , readline
+, networkmanagerapplet
 }:
 
 let
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
     keybinder3
     upower
     xapps
+    networkmanagerapplet
   ];
 
   nativeBuildInputs = [

From 0801820a53ea55df3609cbaee9587304a50d8be6 Mon Sep 17 00:00:00 2001
From: Scott Dier <scott@dier.name>
Date: Mon, 20 Jan 2020 19:43:00 +0100
Subject: [PATCH 296/755] maintainers: add sdier

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6fc68933d244..dc032e5edcd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6276,6 +6276,12 @@
     github = "scubed2";
     name = "Sterling Stein";
   };
+  sdier = {
+    email = "scott@dier.name";
+    github = "sdier";
+    githubId = 11613056;
+    name = "Scott Dier";
+  };
   sdll = {
     email = "sasha.delly@gmail.com";
     github = "sdll";

From 26c3e67ea4a67fbdbc8e2c51f913628ed6f9d019 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 20 Jan 2020 20:46:22 +0100
Subject: [PATCH 297/755] matomo: 3.13.0 -> 3.13.1

---
 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 5c88b8efb4a0..d5f0b7057f07 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -3,8 +3,8 @@
 let
   versions = {
     matomo = {
-      version = "3.13.0";
-      sha256 = "0h4jqibb86zw5l26r927qrbjhba8c79pc4xp3hgpi25p3fjncax8";
+      version = "3.13.1";
+      sha256 = "071m3sw3rrhlccbwdyklcn8rwp4mcnii5m2a7zmgx3rv87i9n2ni";
     };
 
     matomo-beta = {

From ff8f2928eeddb0dfe07365052360484df951aed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Mon, 20 Jan 2020 21:15:47 +0100
Subject: [PATCH 298/755] nixos/syncthing.nix: Sandbox the systemd service.

Using systemd sandboxing features to harden the syncthing service.
---
 .../modules/services/networking/syncthing.nix  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 47b10e408c02..5b3eb6f04b42 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -484,6 +484,24 @@ in {
               -gui-address=${cfg.guiAddress} \
               -home=${cfg.configDir}
           '';
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProtectControlGroups = true;
+          ProtectHostname = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          CapabilityBoundingSet = [
+            "~CAP_SYS_PTRACE" "~CAP_SYS_ADMIN"
+            "~CAP_SETGID" "~CAP_SETUID" "~CAP_SETPCAP"
+            "~CAP_SYS_TIME" "~CAP_KILL"
+          ];
         };
       };
       syncthing-init = mkIf (

From 4a7f07e2b91aadd7b1e75ffb8d0d4db4b41a5b46 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 20 Jan 2020 21:47:48 +0100
Subject: [PATCH 299/755] html-proofer: 3.15.0 -> 3.15.1

---
 pkgs/tools/misc/html-proofer/Gemfile.lock | 10 +++++-----
 pkgs/tools/misc/html-proofer/gemset.nix   | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index ec69f523f3b8..cab69d41f936 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -5,8 +5,8 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.11.3)
-    html-proofer (3.15.0)
+    ffi (1.12.1)
+    html-proofer (3.15.1)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -14,18 +14,18 @@ GEM
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     mini_portile2 (2.4.0)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     parallel (1.19.1)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rainbow (3.0.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    yell (2.2.0)
+    yell (2.2.1)
 
 PLATFORMS
   ruby
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index 1f561f529763..fbf65a8a0c03 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -26,10 +26,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
+      sha256 = "0i2vxj3ryvih5y06mgsa19dwy8fpyx58byh5szp7m6i702p78rni";
       type = "gem";
     };
-    version = "1.11.3";
+    version = "1.12.1";
   };
   html-proofer = {
     dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"];
@@ -37,20 +37,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nmwxmn0dxgs53g1cqn251dzmjrklw14cpa6z6wz7cdwvjq47500";
+      sha256 = "0krd80ga7qcms469l55jbm711a7ph2lmyn88l929nhbxc7sgm81g";
       type = "gem";
     };
-    version = "3.15.0";
+    version = "3.15.1";
   };
   mercenary = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+      sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj";
       type = "gem";
     };
-    version = "0.3.6";
+    version = "0.4.0";
   };
   mini_portile2 = {
     groups = ["default"];
@@ -99,10 +99,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+      sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.0.3";
   };
   rainbow = {
     groups = ["default"];
@@ -130,9 +130,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8";
+      sha256 = "1r2kygdh193qdbjjwhfghzl9czj4jr9xrw3gqyg5hmvmn7lygjwm";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.2.1";
   };
 }
\ No newline at end of file

From 790cd012d0a955ec6bbfd5d0a8b247523ed8810a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 30 Dec 2019 00:49:44 +0100
Subject: [PATCH 300/755] nixos/lib: Inherit type for doRename options

Co-authored-by: Silvan Mosberger <contact@infinisil.com>
---
 lib/modules.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/modules.nix b/lib/modules.nix
index e2315290ff0d..2b1faf4f0c28 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -764,12 +764,15 @@ rec {
       fromOpt = getAttrFromPath from options;
       toOf = attrByPath to
         (abort "Renaming error: option `${showOption to}' does not exist.");
+      toType = let opt = attrByPath to {} options; in opt.type or null;
     in
     {
       options = setAttrByPath from (mkOption {
         inherit visible;
         description = "Alias of <option>${showOption to}</option>.";
         apply = x: use (toOf config);
+      } // optionalAttrs (toType != null) {
+        type = toType;
       });
       config = mkMerge [
         {

From afe27e517b33110b84cc6d1562fa299fc204dad1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 19:57:10 -0500
Subject: [PATCH 301/755] nixos/multitouch: remove

On numerous occasions I have seen users mistake this
module as libinput because it being called "multitouch"
and them being unaware that the actually module they want
is libinput. They then run into several decrepit bugs due
to the completely out-of-date nature of the underlying package.
The underlying package hasn't been changed to an up-to-date
fork in a period of 8 years. I don't consider this to be production quality.
However, I'm not opposed for the module being readded to NixOS
with new packaging, and a better name.
---
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/rename.nix                      |  5 +
 .../services/x11/hardware/multitouch.nix      | 94 -------------------
 .../linux/xf86-input-mtrack/default.nix       | 42 ---------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 7 insertions(+), 139 deletions(-)
 delete mode 100644 nixos/modules/services/x11/hardware/multitouch.nix
 delete mode 100644 pkgs/os-specific/linux/xf86-input-mtrack/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index aaff8dcb3301..979b38e3465f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -871,7 +871,6 @@
   ./services/x11/display-managers/xpra.nix
   ./services/x11/fractalart.nix
   ./services/x11/hardware/libinput.nix
-  ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/hardware/digimend.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 94b5530192e3..26de8a18d922 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -29,6 +29,11 @@ with lib;
     (mkRemovedOptionModule [ "services.fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
     (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
       "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
+    (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
+      services.xserver.multitouch (which uses xf86_input_mtrack) has been removed
+      as the underlying package isn't being maintained. Working alternatives are
+      libinput and synaptics.
+    '')
 
     # Do NOT add any option renames here, see top of the file
   ];
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
deleted file mode 100644
index c03bb3b494fb..000000000000
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.services.xserver.multitouch;
-    disabledTapConfig = ''
-      Option "MaxTapTime" "0"
-      Option "MaxTapMove" "0"
-      Option "TapButton1" "0"
-      Option "TapButton2" "0"
-      Option "TapButton3" "0"
-    '';
-in {
-
-  options = {
-
-    services.xserver.multitouch = {
-
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable multitouch touchpad support.";
-      };
-
-      invertScroll = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Whether to invert scrolling direction à la OSX Lion";
-      };
-
-      ignorePalm = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Whether to ignore touches detected as being the palm (i.e when typing)";
-      };
-
-      tapButtons = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether to enable tap buttons.";
-      };
-
-      buttonsMap = mkOption {
-        type = types.listOf types.int;
-        default = [3 2 0];
-        example = [1 3 2];
-        description = "Remap touchpad buttons.";
-        apply = map toString;
-      };
-
-      additionalOptions = mkOption {
-        type = types.str;
-        default = "";
-        example = ''
-          Option "ScaleDistance" "50"
-          Option "RotateDistance" "60"
-        '';
-        description = ''
-          Additional options for mtrack touchpad driver.
-        '';
-      };
-
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-
-    services.xserver.modules = [ pkgs.xf86_input_mtrack ];
-
-    services.xserver.config =
-      ''
-        # Automatically enable the multitouch driver
-        Section "InputClass"
-          MatchIsTouchpad "on"
-          Identifier "Touchpads"
-          Driver "mtrack"
-          Option "IgnorePalm" "${boolToString cfg.ignorePalm}"
-          Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
-          Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
-          Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
-          ${optionalString (!cfg.tapButtons) disabledTapConfig}
-          ${optionalString cfg.invertScroll ''
-            Option "ScrollUpButton" "5"
-            Option "ScrollDownButton" "4"
-            Option "ScrollLeftButton" "7"
-            Option "ScrollRightButton" "6"
-          ''}
-          ${cfg.additionalOptions}
-        EndSection
-      '';
-
-  };
-
-}
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
deleted file mode 100644
index 2897e9200fd7..000000000000
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  stdenv
-, fetchurl
-, utilmacros
-, pkgconfig
-, mtdev
-, xorgserver
-, xorgproto
-, pixman
-, autoreconfHook
-}:
-
-stdenv.mkDerivation {
-  name = "xf86-input-mtrack-0.3.0";
-
-  buildInputs = [
-    utilmacros
-    pkgconfig
-    mtdev
-    xorgserver
-    xorgproto
-    pixman
-    autoreconfHook
-  ];
-
-  CFLAGS = "-I${pixman}/include/pixman-1";
-
-  src = fetchurl {
-    name = "xf86-input-mtrack.tar.gz";
-    url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0";
-    sha256 = "174rdw7gv0wsnjgmwpx4pgjn1zfbylflda4k2dzff6phzxj9yl6v";
-  };
-
-  meta = {
-    homepage = https://github.com/BlueDragonX/xf86-input-mtrack;
-
-    description = "An Xorg driver for multitouch trackpads";
-
-    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 68dfe49545a4..b45ddc6f5065 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -475,6 +475,8 @@ mapAliases ({
   xbmcPlugins = kodiPlugins; # added 2018-04-25
   xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
+  xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
+    + "and is broken. Working alternatives are libinput and synaptics.");
   xlibs = xorg; # added 2015-09
   xpraGtk3 = xpra; # added 2018-09-13
   youtubeDL = youtube-dl;  # added 2014-10-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37829bedefbf..b407fa483f35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17217,8 +17217,6 @@ in
 
   xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
 
-  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
-
   xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
 
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };

From b7b4e443fcb3b5cf69ba832e529b1bbc7e574afd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 Jan 2020 19:59:25 -0500
Subject: [PATCH 302/755] xf86_input_multitouch: remove

The source repo doesn't exist and it hasn't been touched in 8 years.
There is also no module to interface with it in NixOS.
---
 .../linux/xf86-input-multitouch/default.nix   | 48 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/xf86-input-multitouch/default.nix

diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
deleted file mode 100644
index 71242348f681..000000000000
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv
-, fetchgit
-, mtdev
-, pixman
-, xorg
-, libpciaccess
-}:
-
-stdenv.mkDerivation {
-  name = "xf86-input-multitouch-20110312";
-
-  src = fetchgit {
-    url = http://bitmath.org/git/multitouch.git;
-    rev = "4d87c041f6a232aa30528d70d4b9946d1824b4ed";
-    sha256 = "1jh52d3lkmchn5xdbz4qn50d30nild1zxvfbvwwl2rbmphs5ww6y";
-  };
-
-  # Configuration from http://bitmath.org/code/multitouch/
-  confFile = ''
-    Section "InputClass"
-        MatchIsTouchpad "true"
-        Identifier "Multitouch Touchpad"
-        Driver "multitouch"
-    EndSection
-  '';
-
-  buildInputs = with xorg; [
-    mtdev xorgproto libpciaccess libxcb
-  ];
-
-  buildPhase = ''
-    make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorg.xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude"
-  '';
-
-  installPhase = ''
-    make DESTDIR="$out" LIBDIR="lib" install
-    mkdir -p $out/include/xorg
-    echo -n "$confFile" > $out/include/xorg/10-multitouch.conf
-  '';
-
-  meta = {
-    homepage = http://bitmath.org/code/multitouch/;
-
-    description = "Brings multitouch gestures to the Linux desktop";
-
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b45ddc6f5065..c64b56dd5cef 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -477,6 +477,7 @@ mapAliases ({
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
     + "and is broken. Working alternatives are libinput and synaptics.");
+  xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20
   xlibs = xorg; # added 2015-09
   xpraGtk3 = xpra; # added 2018-09-13
   youtubeDL = youtube-dl;  # added 2014-10-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b407fa483f35..0ed67ddd3d1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17217,8 +17217,6 @@ in
 
   xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
 
-  xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
-
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };

From 651e73484e7842b02d6f05422479b99dbe2606c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 13:10:24 -0800
Subject: [PATCH 303/755] facter: 3.14.6 -> 3.14.7 (#78083)

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 86aa5adb6f8f..acc3990378fd 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "facter";
-  version = "3.14.6";
+  version = "3.14.7";
 
   src = fetchFromGitHub {
-    sha256 = "1zfff1mpdwnlnm8dmmlvysw2zdsnglgk5nvhhzx8zyk0zyz0nj54";
+    sha256 = "1x71ynnp8l5bf6m1a56rwcjya2swrhpxmd0cg9ndjplam6zys2v7";
     rev = version;
     repo = pname;
     owner = "puppetlabs";

From 74775d1d72a232c6e9f3976c3d9bd6767b57836e Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 20 Jan 2020 22:42:38 +0100
Subject: [PATCH 304/755] lib/attrsets: Fix error in comment for
 getAttrFromPath

---
 lib/attrsets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 086c3d746fc1..32994432d53d 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -60,7 +60,7 @@ rec {
       [ { name = head attrPath; value = setAttrByPath (tail attrPath) value; } ];
 
 
-  /* Like `getAttrPath' without a default value. If it doesn't find the
+  /* Like `attrByPath' without a default value. If it doesn't find the
      path it will throw.
 
      Example:

From a43a5479a5af1a4b4d9b6b053dedd4cae2ff476d Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Mon, 20 Jan 2020 23:07:18 +0100
Subject: [PATCH 305/755] firejail: updated the homepage address

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 5a1337b0998d..678592c03791 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = https://l3net.wordpress.com/projects/firejail/;
+    homepage = https://firejail.wordpress.com/;
     downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/";
   };
 }

From 5e34af0f31b227d04cc536bd8776f954759d7d43 Mon Sep 17 00:00:00 2001
From: blargg <tomjankauski@gmail.com>
Date: Mon, 20 Jan 2020 15:40:51 -0600
Subject: [PATCH 306/755] cargo-crev: 0.13.0 -> 0.15.0

---
 pkgs/development/tools/rust/cargo-crev/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index 01ca288fba8c..60d0c3504c87 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-crev";
-  version = "0.13.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
     rev = "v${version}";
-    sha256 = "15b4spz080y411h7niwzb1rshhyd9cx7rc6bpa0myd2kzrfky7yl";
+    sha256 = "1v7m2yy54jm5mkg9n3wnba1j5ldw6mvk2sgbngx1q240wnc9vbnk";
   };
 
-  cargoSha256 = "02bi6pzm1ys31zi1s5yzyw47dmdgclgkfjyyfa9h686640nakg8d";
+  cargoSha256 = "09kcvrhklbzjjyqikj9c53w24qy3f6v5hb16ib4fq1s2ia77rgl2";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 5d7f7fbf5e643558219c9cbbea3b2347bc69717b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:18:18 -0500
Subject: [PATCH 307/755] flexget: 3.0.31 -> 3.1.10

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 98d37fae9114..736137783651 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FlexGet";
-  version = "3.0.31";
+  version = "3.1.10";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "b9edd905556c77b40046b5d7a27151b76a1c9a8c43a4e4153279ad42a784844e";
+    sha256 = "d16c519630350dd1ca867529970b47438950f078e16f9f1d37bc3f027666bda4";
   };
 
   postPatch = ''
@@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
     jinja2
     jsonschema
     loguru
+    more-itertools
     progressbar
     pynzb
     pyparsing

From 3a06e5f7669cba44e4ad61fa3ba13d37a8a44deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 19:19:15 +0100
Subject: [PATCH 308/755] cinnamon.cinnamon-menus: init at 4.4.0

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

diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
new file mode 100644
index 000000000000..562ecdbfa77b
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
@@ -0,0 +1,40 @@
+{ fetchFromGitHub
+, glib
+, gobject-introspection
+, meson
+, ninja
+, pkgconfig
+, stdenv
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cinnamon-menus";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0q4qj28swi2y93fj7pfil68l2cf9gmhbk6jmr8d70l54xf7sigsh";
+  };
+
+  buildInputs = [
+    glib
+    gobject-introspection
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    wrapGAppsHook
+    pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cinnamon-menus";
+    description = "A menu system for the Cinnamon project";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 4ffbf8f6bb31..cbf066decb0b 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -2,6 +2,7 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
+  cinnamon-menus = callPackage ./cinnamon-menus { };
   cjs = callPackage ./cjs { };
   xapps = callPackage ./xapps { };
 })

From 1170b0ecb02b50172efafc26b8ff607a695645f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 19:15:48 +0100
Subject: [PATCH 309/755] cinnamon.cinnamon-translations: init at 4.4.0

---
 .../cinnamon-translations/default.nix         | 31 +++++++++++++++++++
 pkgs/desktops/cinnamon/default.nix            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-translations/default.nix

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
new file mode 100644
index 000000000000..65df49a5a1c0
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, fetchFromGitHub
+, gettext
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cinnamon-translations";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0hh6shfj7vc1mw814l38cakfmh135ba8j604h1rmx4zwspwgvgzh";
+  };
+
+  nativeBuildInputs = [
+    gettext
+  ];
+
+  installPhase = ''
+    mv usr $out # files get installed like so: msgfmt -o usr/share/locale/$lang/LC_MESSAGES/$dir.mo $file
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cinnamon-translations";
+    description = "Translations files for the Cinnamon desktop";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index cbf066decb0b..456fb960c626 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -3,6 +3,7 @@
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cinnamon-menus = callPackage ./cinnamon-menus { };
+  cinnamon-translations = callPackage ./cinnamon-translations { };
   cjs = callPackage ./cjs { };
   xapps = callPackage ./xapps { };
 })

From e902495a51a0023197900c906edef501bc9c9a07 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 21 Jan 2020 01:39:41 +0000
Subject: [PATCH 310/755] apngasm: init at 3.1.9

---
 .../applications/graphics/apngasm/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/graphics/apngasm/default.nix

diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix
new file mode 100644
index 000000000000..8d50696efcbd
--- /dev/null
+++ b/pkgs/applications/graphics/apngasm/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "apngasm";
+  version = "3.1.9";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "d50bfb0cf14c376f4cfb94eb91c61d795a76b715"; # not tagged, but in debian/changelog
+    sha256 = "0pk0r8x1950pm6j3d5wgryvy3ldm7a9gl59jmnwnjmg1sf9mzf97";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ boost libpng zlib ];
+
+  meta = with stdenv.lib; {
+    description = "Create an APNG from multiple PNG files";
+    homepage = "https://github.com/apngasm/apngasm";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 519dc633f7c0..60b4c46e68e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18092,6 +18092,8 @@ in
 
   apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {};
 
+  apngasm = callPackage ../applications/graphics/apngasm {};
+
   appeditor = callPackage ../applications/misc/appeditor { };
 
   aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { };

From ff708504cd2fa33a1b042ebd9da78187411ac66d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 21 Jan 2020 01:44:53 +0000
Subject: [PATCH 311/755] apngasm_2: init at 2.91

This is the original apngasm which has not been updated since 2017 but it has
diverged from its fork with support for LZMA and ZOPFLI compression and TGA
input.
---
 pkgs/applications/graphics/apngasm/2.nix | 35 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/graphics/apngasm/2.nix

diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/applications/graphics/apngasm/2.nix
new file mode 100644
index 000000000000..166bc135c193
--- /dev/null
+++ b/pkgs/applications/graphics/apngasm/2.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchzip, libpng, zlib, zopfli }:
+
+stdenv.mkDerivation rec {
+  pname = "apngasm";
+  version = "2.91";
+
+  src = fetchzip {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}-src.zip";
+    stripRoot = false;
+    sha256 = "0qhljqql159xkn1l83vz0q8wvzr7rjz4jnhiy0zn36pgvacg0zn1";
+  };
+
+  buildInputs = [ libpng zlib zopfli ];
+
+  postPatch = ''
+    rm -rf libpng zlib zopfli
+  '';
+
+  NIX_CFLAGS_LINK = "-lzopfli";
+
+  installPhase = ''
+    install -Dt $out/bin apngasm
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Create highly optimized Animated PNG files from PNG/TGA images";
+    homepage = "http://apngasm.sourceforge.net/";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60b4c46e68e9..8ecbe6f21566 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18093,6 +18093,7 @@ in
   apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {};
 
   apngasm = callPackage ../applications/graphics/apngasm {};
+  apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {};
 
   appeditor = callPackage ../applications/misc/appeditor { };
 

From 25d0d2b5e88071f09d701c1ad3958796a62e3c9d Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Sun, 12 Jan 2020 18:27:17 +0100
Subject: [PATCH 312/755] doc: python: refreshing virtualenv section for venv

Updating section about imperative use of ad-hoc virtual-environments for
use of pythons built-in `venv` module via venvShellHook.  Also trying to
make it a bit friendlier to beginners by adding a bit more explanation
to the code snippet and some remarks old-school virtualenv.

Adjusting for venvShellHook and adding manual example

Adding pip install and replacing python2 example with python3
---
 doc/languages-frameworks/python.section.md | 79 +++++++++++++++++-----
 1 file changed, 61 insertions(+), 18 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index bbcf82f7ed69..9b6de47c8e86 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1029,36 +1029,43 @@ If you want to create a Python environment for development, then the recommended
 method is to use `nix-shell`, either with or without the `python.buildEnv`
 function.
 
-### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ?
+### How to consume python modules using pip in a virtual environment like I am used to on other Operating Systems?
 
-This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment,
+While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing
+projects or in situations where it's not feasible or desired to write derivations for all required dependencies.
+
+This is an example of a `default.nix` for a `nix-shell`, which allows to consume a virtual environment created by `venv`,
 and install python modules through `pip` the traditional way.
 
 Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`.
 
 ```nix
-with import <nixpkgs> {};
+with import <nixpkgs> { };
 
 let
-  pythonPackages = python27Packages;
-in
-
-stdenv.mkDerivation {
+  pythonPackages = python3Packages;
+in pkgs.mkShell rec {
   name = "impurePythonEnv";
-
-  src = null;
-
+  venvDir = "./.venv";
   buildInputs = [
-    # these packages are required for virtualenv and pip to work:
-    #
-    pythonPackages.virtualenv
-    pythonPackages.pip
+    # A python interpreter including the 'venv' module is required to bootstrap
+    # the environment.
+    pythonPackages.python
+
+    # This execute some shell code to initialize a venv in $venvDir before
+    # dropping into the shell
+    pythonPackages.venvShellHook
+
+    # Those are dependencies that we would like to use from nixpkgs, which will
+    # add them to PYTHONPATH and thus make them accessible from within the venv.
+    pythonPackages.numpy
+    pythonPackages.requests
+
     # the following packages are related to the dependencies of your python
     # project.
     # In this particular example the python modules listed in the
     # requirements.txt require the following packages to be installed locally
     # in order to compile any binary extensions they may require.
-    #
     taglib
     openssl
     git
@@ -1068,11 +1075,47 @@ stdenv.mkDerivation {
     zlib
   ];
 
+  # Now we can execute any commands within the virtual environment
+  postShellHook = ''
+    pip install -r requirements.txt
+  '';
+
+}
+```
+
+In case the supplied venvShellHook is insufficient, or when python 2 support is needed,
+you can define your own shell hook and adapt to your needs like in the following example:
+
+```nix
+with import <nixpkgs> { };
+
+let
+  venvDir = "./.venv";
+in pkgs.mkShell rec {
+  name = "impurePythonEnv";
+  buildInputs = [
+    python3Packages.python
+    python3Packages.virtualenv
+    ...
+  ];
+
+  # This is very close to how venvShellHook is implemented, but
+  # adapted to use 'virtualenv'
   shellHook = ''
-    # set SOURCE_DATE_EPOCH so that we can use python wheels
     SOURCE_DATE_EPOCH=$(date +%s)
-    virtualenv --python=${pythonPackages.python.interpreter} --no-setuptools venv
-    export PATH=$PWD/venv/bin:$PATH
+
+    if [ -d "${venvDir}" ]; then
+      echo "Skipping venv creation, '${venvDir}' already exists"
+    else
+      echo "Creating new venv environment in path: '${venvDir}'"
+      ${pythonPackages.python.interpreter} -m venv "${venvDir}"
+    fi
+
+    # Under some circumstances it might be necessary to add your virtual
+    # environment to PYTHONPATH, which you can do here too;
+    # PYTHONPATH=$PWD/${venvDir}/${python.sitePackages}/:$PYTHONPATH
+
+    source "${venvDir}/bin/activate"
     pip install -r requirements.txt
   '';
 }

From ad6e8aa7c3f6ebc01c4d8879e738b67d5a9d5024 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 31 Dec 2019 15:23:03 -0800
Subject: [PATCH 313/755] pythonPackages.flux_led: init at v0.22

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

diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
new file mode 100644
index 000000000000..1cbfca78462f
--- /dev/null
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, aiohttp, zigpy
+, pytest, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "flux_led";
+  version = "0.22";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "Danielhiversen";
+    repo = "flux_led";
+    rev = version;
+    sha256 = "1zgajlkhclyrqhkmivna4ha2lyvfpk5929s042gy59p7mzpkvjx7";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Python library to communicate with the flux_led smart bulbs";
+    homepage = "https://github.com/Danielhiversen/flux_led";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ colemickens ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c14028bae9dd..d761f7a8dabd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2585,6 +2585,8 @@ in {
 
   fluent-logger = callPackage ../development/python-modules/fluent-logger {};
 
+  flux-led = callPackage ../development/python-modules/flux-led { };
+
   python-forecastio = callPackage ../development/python-modules/python-forecastio { };
 
   fpdf = callPackage ../development/python-modules/fpdf { };

From 817d6c8ab2977b87a446e743febeb5d628617a7e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 19 Jan 2020 01:11:09 -0800
Subject: [PATCH 314/755] pythonPackages.getmac: init at 0.8.2

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

diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix
new file mode 100644
index 000000000000..51ce0ef05031
--- /dev/null
+++ b/pkgs/development/python-modules/getmac/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, pytest, pytest-benchmark, pytest-mock }:
+
+buildPythonPackage rec {
+  pname = "getmac";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "GhostofGoes";
+    repo = "getmac";
+    rev = version;
+    sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2";
+  };
+
+  checkInputs = [ pytest pytest-benchmark pytest-mock ];
+  checkPhase = ''
+    pytest --ignore tests/test_cli.py
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/GhostofGoes/getmac";
+    description = "Pure-Python package to get the MAC address of network interfaces and hosts on the local network.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d761f7a8dabd..34f9d5e3d1d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -692,6 +692,8 @@ in {
 
   geoip2 = callPackage ../development/python-modules/geoip2 { };
 
+  getmac = callPackage ../development/python-modules/getmac { };
+
   gidgethub = callPackage ../development/python-modules/gidgethub { };
 
   gin-config = callPackage ../development/python-modules/gin-config { };

From cacbe5f3427244c96fe9177580cdd4d0ced59989 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Jan 2020 09:30:23 +0100
Subject: [PATCH 315/755] ocamlPackages.stdint: disable for OCaml < 4.07

---
 pkgs/development/ocaml-modules/stdint/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix
index a36d84ffa3a7..bffef61956e2 100644
--- a/pkgs/development/ocaml-modules/stdint/default.nix
+++ b/pkgs/development/ocaml-modules/stdint/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchFromGitHub, buildDunePackage }:
+{ lib, fetchFromGitHub, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "stdint";
   version = "0.6.0";
 
+  minimumOCamlVersion = "4.07";
+
   src = fetchFromGitHub {
     owner = "andrenth";
     repo = "ocaml-stdint";
@@ -14,7 +16,7 @@ buildDunePackage rec {
   meta = {
     description = "Various signed and unsigned integers for OCaml";
     homepage = "https://github.com/andrenth/ocaml-stdint";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.gebner ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.gebner ];
   };
 }

From 0f7016d404d0e85b226101a462f266d1463adb4d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Jan 2020 09:30:27 +0100
Subject: [PATCH 316/755] =?UTF-8?q?ocamlPackages.ocaml-migrate-parsetree:?=
 =?UTF-8?q?=201.4.0=20=E2=86=92=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 23940ef14995..f633d17252cd 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, result, ppx_derivers }:
+{ lib, fetchFromGitHub, buildDunePackage, result, ppx_derivers }:
 
 buildDunePackage rec {
    pname = "ocaml-migrate-parsetree";
-   version = "1.4.0";
+   version = "1.5.0";
 
    src = fetchFromGitHub {
      owner = "ocaml-ppx";
      repo = pname;
      rev = "v${version}";
-     sha256 = "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2";
+     sha256 = "0ms7nx7x16nkbm9rln3sycbzg6ad8swz8jw6bjndrill8bg3fipv";
    };
 
    propagatedBuildInputs = [ ppx_derivers result ];
 
    meta = {
      description = "Convert OCaml parsetrees between different major versions";
-     license = stdenv.lib.licenses.lgpl21;
-     maintainers = [ stdenv.lib.maintainers.vbgl ];
+     license = lib.licenses.lgpl21;
+     maintainers = [ lib.maintainers.vbgl ];
      inherit (src.meta) homepage;
    };
 }

From 227a3f438300a20c88e2017109ffb3d1ac0f7a58 Mon Sep 17 00:00:00 2001
From: DwarfMaster <luc@dwarfmaster.net>
Date: Tue, 21 Jan 2020 16:39:52 +1000
Subject: [PATCH 317/755] Renamed maintainer lucas8 -> dwarfmaster

---
 maintainers/maintainer-list.nix                     | 12 ++++++------
 pkgs/applications/graphics/imlibsetroot/default.nix |  2 +-
 pkgs/applications/science/logic/cubicle/default.nix |  2 +-
 pkgs/tools/text/fanficfare/default.nix              |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dc032e5edcd9..844ed91360d6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1919,6 +1919,12 @@
       fingerprint = "5DD7 C6F6 0630 F08E DAE7  4711 1525 585D 1B43 C62A";
     }];
   };
+  dwarfmaster = {
+    email = "nixpkgs@dwarfmaster.net";
+    github = "dwarfmaster";
+    githubId = 2025623;
+    name = "Luc Chabassier";
+  };
   dxf = {
     email = "dingxiangfei2009@gmail.com";
     github = "dingxiangfei2009";
@@ -4169,12 +4175,6 @@
     github = "ltavard";
     name = "Laure Tavard";
   };
-  lucas8 = {
-    email = "luc.linux@mailoo.org";
-    github = "lucas8";
-    githubId = 2025623;
-    name = "Luc Chabassier";
-  };
   lucus16 = {
     email = "lars.jellema@gmail.com";
     github = "Lucus16";
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index 49868bbd831f..8ca4d71bb56c 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ lucas8 ];
+    maintainers = with maintainers; [ dwarfmaster ];
   };
 }
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index cd41e1ca64b9..d198de41f9b7 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://cubicle.lri.fr/;
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ lucas8 ];
+    maintainers = with maintainers; [ dwarfmaster ];
   };
 }
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index b01317a532ff..31952cb1b1b3 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
     homepage = https://github.com/JimmXinu/FanFicFare;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ lucas8 ];
+    maintainers = with maintainers; [ dwarfmaster ];
     inherit version;
   };
 }

From 1d24ce5ba0ffe410ca2e970ab7ed21304684dbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Jan 2020 07:56:14 +0000
Subject: [PATCH 318/755] snitun: fix macOS build

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

diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix
index da9dbd798450..8212379e3d48 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/pkgs/development/python-modules/snitun/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }:
+{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }:
 
 buildPythonPackage rec {
   pname = "snitun";
@@ -16,7 +16,8 @@ buildPythonPackage rec {
   checkInputs = [ pytest pytest-aiohttp ];
 
   checkPhase = ''
-    pytest tests/
+    # https://github.com/NabuCasa/snitun/issues/61
+    pytest ${lib.optionalString stdenv.isDarwin "-k 'not test_multiplexer_data_channel_abort_full'"} tests/
   '';
 
   meta = with lib; {

From 2e2b4d39fc33e26da3a0c0fa3813d492bd9dc1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 21 Jan 2020 02:32:57 +0100
Subject: [PATCH 319/755] cinnamon.cinnamon-settings-daemon: init at 4.4.0

---
 .../csd-backlight-helper-fix.patch            |  48 ++++++++
 .../cinnamon-settings-daemon/default.nix      | 111 ++++++++++++++++++
 pkgs/desktops/cinnamon/default.nix            |   1 +
 3 files changed, 160 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix

diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
new file mode 100644
index 000000000000..967ba98eb48f
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
@@ -0,0 +1,48 @@
+From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Tue, 21 Jan 2020 03:19:28 +0100
+Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
+ policy-reload bug
+
+---
+ plugins/power/csd-power-manager.c                             | 4 ++--
+ .../org.cinnamon.settings-daemon.plugins.power.policy.in.in   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index b24c456..212c47e 100755
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
+ #endif
+
+         /* get the data */
+-        command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
++        command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s",
+                                    argument,
+                                    manager->priv->backlight_helper_preference_args);
+         ret = g_spawn_command_line_sync (command,
+@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument,
+ #endif
+
+         /* get the data */
+-        command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s",
++        command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s",
+                                    argument, value,
+                                    manager->priv->backlight_helper_preference_args);
+         ret = g_spawn_command_line_sync (command,
+diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
+index 2c44e62..c0a2348 100755
+--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
++++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
+@@ -25,7 +25,7 @@
+       <allow_inactive>no</allow_inactive>
+       <allow_active>yes</allow_active>
+     </defaults>
+-    <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
++    <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
+   </action>
+
+ </policyconfig>
+--
+2.24.1
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
new file mode 100644
index 000000000000..1dc58e3c3b5b
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -0,0 +1,111 @@
+{ fetchFromGitHub
+, autoconf-archive
+, autoreconfHook
+, cinnamon-desktop
+, colord
+, glib
+, gsettings-desktop-schemas
+, gtk3
+, intltool
+, lcms2
+, libcanberra-gtk3
+, libgnomekbd
+, libnotify
+, libxklavier
+, wrapGAppsHook
+, pkgconfig
+, pulseaudio
+, stdenv
+, systemd
+, upower
+, dconf
+, cups
+, polkit
+, librsvg
+, libwacom
+, xf86_input_wacom
+, xorg
+, fontconfig
+, tzdata
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cinnamon-settings-daemon";
+  version = "4.4.0";
+
+  /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
+   #include "csd-power-proxy.h"
+            ^~~~~~~~~~~~~~~~~~~
+  compilation terminated. */
+
+  # but this occurs only sometimes, so disabling parallel building
+  # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248
+  enableParallelBuilding = false;
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "1h74d68a7hx85vv6ak26b85jq0wr56ps9rzfvqsnxwk81zxw2n7q";
+  };
+
+  patches = [
+    ./csd-backlight-helper-fix.patch
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+
+  buildInputs = [
+    cinnamon-desktop
+    colord
+    gtk3
+    glib
+    gsettings-desktop-schemas
+    lcms2
+    libcanberra-gtk3
+    libgnomekbd
+    libnotify
+    libxklavier
+    pulseaudio
+    systemd
+    upower
+    dconf
+    cups
+    polkit
+    librsvg
+    libwacom
+    xf86_input_wacom
+    xorg.libXext
+    xorg.libX11
+    xorg.libXi
+    xorg.libXtst
+    xorg.libXfixes
+    fontconfig
+  ];
+
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    wrapGAppsHook
+    intltool
+    pkgconfig
+  ];
+
+  postPatch = ''
+    sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h
+  '';
+
+  # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper
+  postFixup = ''
+    mkdir -p $out/bin/cinnamon-settings-daemon
+    ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cinnamon-settings-daemon";
+    description = "The settings daemon for the Cinnamon desktop";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 456fb960c626..d58a6e4a0df5 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -4,6 +4,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cinnamon-menus = callPackage ./cinnamon-menus { };
   cinnamon-translations = callPackage ./cinnamon-translations { };
+  cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   cjs = callPackage ./cjs { };
   xapps = callPackage ./xapps { };
 })

From d7de1de097329302ea056ef2394072739db5f949 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Jan 2020 10:01:35 +0100
Subject: [PATCH 320/755] toot: 0.24.0 -> 0.25.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/misc/toot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 13e0cdfb2607..bfae97027c47 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.24.0";
+  version = "0.25.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = version;
-    sha256 = "1szpmkxc1lqfphicfcj0z7b1nq97xmb4ppwf806p8w0fxj1shil3";
+    sha256 = "0padc5jbr55spgbp4avk2kj3if52vzn8dg4ch5jc3h5fvb9l8xz1";
   };
 
   checkInputs = with python3Packages; [ pytest ];

From 64699cadeae6cde7fa10d89156c5c39a94806edc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Jan 2020 04:20:00 -0500
Subject: [PATCH 321/755] pspg: 2.6.4 -> 2.6.6

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

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 814cdb1b3b4a..bb0469efa8c2 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }:
+{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }:
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "2.6.4";
+  version = "2.6.6";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "1sp6ign4phr5j5gg0n345wf2ssihsvqmc8lww8vddi6hiq1l86gp";
+    sha256 = "0l20ysr61y99zxvm8cqsgj7arv4m7h7gqq8lrq65bmh9fxncfpsd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnugrep ncurses readline ];
+  buildInputs = [ gnugrep ncurses readline postgresql ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 

From 8af54fcfaeb74776c24b4c6381b0b2a7514e0bc8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Jan 2020 04:20:00 -0500
Subject: [PATCH 322/755] pspg: enable on darwin

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

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index bb0469efa8c2..4cf98ef8b485 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/okbob/pspg";
     description = "Postgres Pager";
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.jlesquembre ];
   };
 }

From 62af7804ef998a9fa9739e30d8cdcb71dde91536 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 14 Jan 2020 14:04:21 +0100
Subject: [PATCH 323/755] nomachine-client: 6.8.1 -> 6.9.2

---
 pkgs/tools/admin/nomachine-client/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index e8efc7d9cfe3..9e93b5f2f75e 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,8 +1,8 @@
 { stdenv, file, fetchurl, makeWrapper,
   autoPatchelfHook, jsoncpp, libpulseaudio }:
 let
-  versionMajor = "6.8";
-  versionMinor = "1";
+  versionMajor = "6.9";
+  versionMinor = "2";
   versionBuild_x86_64 = "1";
   versionBuild_i686 = "1";
 in
@@ -14,12 +14,12 @@ in
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
-          sha256 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl";
+          sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii";
         }
       else if stdenv.hostPlatform.system == "i686-linux" then
         fetchurl {
           url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
-          sha256 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs";
+          sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6";
         }
       else
         throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";

From 7187891a1783fbc982f827ab7d2012a8e1805c4b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 21 Jan 2020 19:55:44 +0900
Subject: [PATCH 324/755] firefox-bin: 72.0.1 -> 72.0.2

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 567c57aab2c4..0e339253ade9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "72.0.1";
+  version = "72.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ach/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ach/firefox-72.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "43f16a510e67ba4bb836ebf3dd570503b902ec1ae900a9e89c551ea6bdca6bab1a716e92877c16b738b871cb4d1660ad5c26baff3d57d455845f47f22b53bca7";
+      sha512 = "0d7e31be07e67a439754848dd7b2ae0dca7fdb172cc7900db84a90ce15a40bd2c2e80127700195f4b54e3c3008d4541785c58c0fd0bbce060eae6ece77d38b8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/af/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/af/firefox-72.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "72f3fc490ada32629f555e0245056e6f328c05048dada3cd286292d7a8a891f9fa9303ff701a66734f04f1375aebc2c0574637df766f8ae9bd5036db3e81ec15";
+      sha512 = "1ee09340d97967d956d484bb217c5fd7ac3c26ad28714889c18b860f1d03baabc93ea00567743bb0c1650cc7c6934ba56e184e734e89fc0c602cfdbf6366ace8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/an/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/an/firefox-72.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "3afb1f5a6da6d7a4bb4ac047405b511501a1429602f9c1ecc92bfd17d37ae425c7255101598692084a68591c4bcd27c5f94f0cbc10881f6ab4b77b2525521b25";
+      sha512 = "0a50c181a81823b80c67619d97bb1d371544a7b2109fbe02822a44070088247fc11fffe920e0f7290186f85719567114797720fae780f2c6eaf3d1c2462c87fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ar/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ar/firefox-72.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "99a0390d39e6a49ba635cad30466c3c7a55e0aedac25ae13a9ba2f1faff5e8b26813d198e072fa4725028ee526647649b49ad0416cba470619692aff530dbf05";
+      sha512 = "ca36d482348ffb63af556076e2c3ee159e084837c3e3186f4162856ba573dc0fa8849bdef581440bdfe2e12fbec05b0dca4ba294d9483d99020e26b40be4a5d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ast/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ast/firefox-72.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7636e9d0c70267100a0bbb0bfbdae3bb308e2c38fd3d38bf8b13c4112a98aac298fb57391c7e985b5d76b7205b1d180e8d9eb1f73264b44758ab5c56d2ebaccb";
+      sha512 = "9f9e3a9fe29a83a37f09e4b25cb65ad76f30d7312a79d27455d1e9fd51bfcba6db7b25e15a0d8442e1ca26c6f5aa1614c6e1815a0aef56547e81ea8458b89c94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/az/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/az/firefox-72.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "47d667d87a32e9ab1cd33814b3d231324ef3a1ad302d9372476347c118230b8a85b038a04fbf704e93fe4dfd40f9070ee7e61f00d5503884f8c798832d034629";
+      sha512 = "95ee55c2802c4ea246ef3da4121f382d05c60354fae641485c92d7ca05c4c08e1d41b9fe6e5e5109d8e16a14ceed9692ff96d32a81a29770d937c65b5378128e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/be/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/be/firefox-72.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "1a3d6654e9f804fb5eda6700cf6c183fb72dced8d90236a860da636a8856040ad33095e41858b3ae7028d02278998b9aa9adb2ee0daee2600e213185cf43f374";
+      sha512 = "fcc595ddec94a0f5eb4106b1b462a8aad2d8d030bf5288ca08a3b56ee8138ad019457eaecc891175229a00b94d786633f5e1dd501470e94ed6a5e4b9b8d332f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/bg/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bg/firefox-72.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8bb9c4eb8886f6d0ce5a284e09f77587f6bb091a02209a86c60e8c4f0d807a4c78779494db1fa81c10fb9463b9e6a24be7e47de4f52ea239bcaef07198ee9f15";
+      sha512 = "ce4ab1fd20bf0aa69a7cae0af232c9d6c7496b1e63469709f0b8914a2ca7a5dc295ca22f59e368b92b6938b22e582d308ed4c5d7b234350b25a4cb8e9e010cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/bn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bn/firefox-72.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "e9459e8cca78bbc048b26f0610c58e607896588d762b6ca59ed078867932cb35ae2abee79e8271885d7b10a7fb802e1aee73daa65abad64916f25dfd4bd9a7f0";
+      sha512 = "62db7f66b5ebb802243b429a90a368e6d0c1cc27e0382273b627bde7a9db48e32b3e3d7359cbeccc2bf70447534b3ec6a1cb4abcc66d715d971cc8cf1e8cc659";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/br/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/br/firefox-72.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "62c740962f855f22aad7c63b346fdb224a55cf3f7ee1935ee9103f2ab2a638c1f2dd1482cf8d4965f70dd8a56852f6dd676fbd84f5976d6a03c0142468f3b70a";
+      sha512 = "b7836b77b8311989167dc1bbe1b90994c27c03c555134be9df45b160d785b506ed8f7ed0d851f7e2a26ae14e8f8651ea87c077e012836bbeb5e06596dd7498db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/bs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bs/firefox-72.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "71078c35c8ad3fd131529178b75c8a9e3f57f398ff61e230f79fae38e44dfe72d6b9657adf1a636b082a4592ca62d89699e726f9f2bae0f1d5bb3399a8b7362d";
+      sha512 = "2a7dfc194c72143401fdefa4f4df4a414bed4d1fb370b82d0d7bf144c77707211b431314cbf409f07d43ba1cb28e43b78e5278b9cd7548191c09c71240c634d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ca-valencia/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca-valencia/firefox-72.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "807c234fd009bd25dc069be095eb13f499432eb94590c4bb5cf7d84d48cf97f713465b5f56f0ed9f56e30fb94a3aec1a83868b61c6b7a5113d88470c645e2534";
+      sha512 = "db3dfc0414f66330d9a60bb545c92bb01c20dd4872436b30b4a27da3706870a9f40377ad40987850c556e2e14c13081a73fc8382b0bf45c356818f1c30e325ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ca/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca/firefox-72.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "5a26962f759f9c2c12cb7e58d2ed6063224625011dae1a90b9cd27e4b55e47cf9b7c665a8da16ef1a22d8b70fdec4e8902b7d118e62698417905b9f5527ed4e6";
+      sha512 = "d741e0fe55cb9d261832c8cfd5a51e5e88753c2c9483eb5744d80e0885d129a464530771fd5eb1ffba040ac46823fefd74efbadb63935e6d2773a398da160925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/cak/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cak/firefox-72.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "7e51187c51560ff612a9b3c7b06209bb64140e191a4b5cf7b1b2fe3e53450e2020e13e0be096f548cda747b910be038e53ddaa3b969d46e10ce4c163d771c42a";
+      sha512 = "98ac16f8771357d9999789bf2df39f0b4e4d28a32be13c07574fba303ede71b6267f991a1112d83cc95de295383d92a865e3ea5173102466b3d1ed0b2d082faf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/cs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cs/firefox-72.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "09d239079128ac8b6102671cd9d3d2b03989d358f191ae56c11a6639797ba49caf6519ebbdeddd836927fbb7f0df029da055b6d98d4efe1700ba689508c45a1e";
+      sha512 = "c959a5b4008c95923ab0cc6ab669811d700c1b4f5dd0de47ce2d519d7acc1ffc98595a1e8948f6ee7563b2b025307b702595d01365daa57c3552a0e61c85a5da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/cy/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cy/firefox-72.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "e8e2cb301c022db5944e4b5fddc55e0a4a27aa591e4d9deee5e170136f48df956b0bde64311539743f430484035e88e28f080fde3e967d31b424cac0db1d6c41";
+      sha512 = "82b1620bebfac41d498c4ba6bd9d89754dba3c7b48f5073bd41558e735e49a7b95b662efdb247f0eefef8055e07bdea31efbdf579dd17ae7738711fb9679d85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/da/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/da/firefox-72.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "072063ae9757d3f06d4f12439641f8b78b38ec0328cc501db67b13f3c0c5965ef5d170ea22534d9f4804fb66a23fab21b3771391f35aff98d4da3030e5aabb0d";
+      sha512 = "71d5d3192f115df501dd889234e33ebe7b9f101bda2f4b604932fb66d172ea2adb475da408e9774466b1d9c379991895787b441c8af11ac36504d96e63eba402";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/de/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/de/firefox-72.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "4ef88f33a507e8ad65f3f49080e58515b77b09b799d99ae45a725309fe0f4e4b596005c1cb84c22cd815b411c98e4d23494ed454222514ade3fce16fc9b67109";
+      sha512 = "013bac3db996fb3e4bab75c072b02ab0bd04cf6731cc95757b51df9b28c3ac46fdbdc3a17b61388aea842eb0d00dbefe2e9f32d5d758e207995c39338c82c7d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/dsb/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/dsb/firefox-72.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a7b8c9b4328d5c6c6b53dd9226ca469ac75360d71b3bf6ea987e7d1fc7f5d1a270a408dfed4ff3e8d6be557a520c45b2f019d88d62dd007dbb57cc852e6e751e";
+      sha512 = "49ff30d580b38749d8f46b9db90037f844305a3fd716d7f276910475f416d2fc9bc1f0e8fd82544572b4c7840437076f5b194cb37bf0cd39fe7b3b3d355fee05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/el/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/el/firefox-72.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ab31775e09085690623c31c33bdd22a73d2d3d2f5bb13be0bbfdcfcd98d5fb5a16490b705fd42e30cfadaf96026ec147ef758630fd40e1ff3703f14317713e52";
+      sha512 = "7c5e3c97fed944852c3888ccdcdefa9c156712f3aa70c8ca6c3744e7ae32c7fe85e2fcb57c7707e7e4456d7e0cf2d131818552bcc507f082aa9da2ad89267180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/en-CA/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-CA/firefox-72.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "6d20bb65de74571c233cc424dd2442c8fbc7a77347ee1b0ca6e0d6f5d11ff2a21f23c6a0ca9509836b19d75ac88186f17513cf3cd99696ac4f7b16a42f434f17";
+      sha512 = "5dceff7aefa5eb668a38487e44fcfdf2d72e4717cd9f6a0beb58bb25c8826086a960a67a70a5d563af0db2865c001ed23eaf7414000d1cf184d10a9267473740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/en-GB/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-GB/firefox-72.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "058654254505d6be377fe9de989638d1c758ac05ad9244a4ebf0d9a233dea9e7be4dacd35d1b12a20e3b8deb53b474f13e0fb38e3e7ad85c64e48d664b85bcd3";
+      sha512 = "1f47f38344683e1e0afb5f5aeb46f3a7cb1aa80b38730a88cdc9904e66f35c14cbd9b3002deeee2f7387aec9f30ffbc306a3a655296f15650272b7185e6fb0fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/en-US/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-US/firefox-72.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "8ebdc0eff1e8e0fe269680041276268775e1d6cfa45cf0139593082275abe1486b8be9dc6989811b30ba8bde7453e1ae7b37ccfb9712482815ece731fa07e396";
+      sha512 = "009e4569271e6ffff2325a04ee6b337804c69bf96d3d74682da0a8abc5adf42959658237a01feff736b8336df0c69445fac2d9a8292680173d5f82ecbc262043";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/eo/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eo/firefox-72.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "02242eab6cac30f19d5333458e1a0eafead00338ed33007387430739a628aba1928a4dd10cea2ab4c828b98840d55c2616d573f1ba09a9f9b26c01e79bff8613";
+      sha512 = "a61206783846e1fbe55b065c02c8217905222fa92de0290bf42ba2b06745d6903aea5bd575a318b83c2fc1f1aea149040b6b68d9ff98ad3c0d537081951ffcea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/es-AR/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-AR/firefox-72.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b60242c35164d66efab4a72b7351982465a03498be29f9a994f3397138b9aad37a7c1f8158f3dfb8b1166f8db0ade5b45f1077257dc3f2f5f5712e31f98618d9";
+      sha512 = "14d6c0cd17e6560e2f4193e8cd182b8dba0b94edc3fc9e407ba3b9423e153f8d74fa0c797a431ef03586a0c8ed8193f3a8b26bc2683c1cb45a27d9c21401ec41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/es-CL/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-CL/firefox-72.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f5e388ce9e6edc6ac081b672131a1df5c761a79cd303b5cb5eb22b870e6e3fd0425240707d97a0ecc46e008b913276cb63a88ee7640e4ae7aff81612876177f2";
+      sha512 = "cef6af646f98a5ba5b5e01dc49317dd54efe392b88d3ce93ee220fe880c0b1dd7855c5a004f1b93ae27583df1fae030f4b90031312bd92443cf77e08e746c844";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/es-ES/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-ES/firefox-72.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "07698512c0d024483b169c75bd2ec8e434bf3c91e47ecf80e73c8c8a982d9eb803dfd6fede85651abbb50226aea185deeea4f6c0c42144c96c59040ed2a24e4c";
+      sha512 = "ff17aa9c3c804539d6bcce2e760da2603d914e9d345c7d6e3465d7856a1ee9f581147505779fa81e4d512252fd72334abccd9f2fb1fbbf4ae6ddb47e02561483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/es-MX/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-MX/firefox-72.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "4448dbe8bf8bee11d0c7b7b5321dbd6c1fea6d594150539b6c6ea8abdddb96100fce21ac1cbf01aa226b95b2f6db8a76faa6c11089abac2732d44b376e63862f";
+      sha512 = "b587ab2e8daa659011f8001b2b5ee544462e789f1bb46d9f32073f5a3a3cc34e34708035e1dbef6d6385673afecae66c4db18d86056f2fe81d0ddd06314b8164";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/et/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/et/firefox-72.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "fc8db28e2abd979d4a87bc875948412db6e8ec41571d34d397717f35abd4638234108cb5011c8ad6380a48886f6fd3d891a18d1bc2e7e5967ef128f386c91121";
+      sha512 = "b92b11d2ac93c67b858536533794e8da01846485b9dc300b74fc8da3f6856c9278f2cee1599da354bb374a22bd3adfe24924c0c33d080fa9c05c70006a9fe347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/eu/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eu/firefox-72.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "9af8073945a2f554be15fae8c7788ee9fff0da2e1232fe9dbf72150c9076c55260c0c0a30363be02e6b1b5da8d216e2edb2712287d55537e3755a3124e7d6179";
+      sha512 = "30b34427404fdc43c09b5ff6cbc1ef27caec99f8b258ae0d227b0f38383d9b3dc95d7454ce344584706c0340a3859e6fedf125bb87e4f9f11fd1005647b42f8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/fa/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fa/firefox-72.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "b8832d7bbd64fbd3900595c4f66fd79458577bbf944c15794920d244db24de7541c3bcc2911719a3dbd2f5beb36ebfb2629bd6961cbcb9b4a2a37ec451373759";
+      sha512 = "f04b9d5205fb63f8a6d8cf83d5845bdcd7d9b9b1b01f59cff61b3a1042f9cd23b077ed1fc10b6484b87bf019e72fdba313568306bf9e19f7e98ea54cf58b5b9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ff/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ff/firefox-72.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "6ba67b46cb76ab9e75dfd07d7ae6dc81bca9f6bca3d6650efbcf4115ba5b9f09135318c547b0785f4d6330987683d436f3f8881920ab823a33402326a659fda5";
+      sha512 = "789a7dc7ce2d13edce2ad38a64507af6e840426665dd98b072271d4da49d9fae34786c7e64f8f0baba0ed70efa784b40d45537ef1f17a019043dbb65fffc7df0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/fi/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fi/firefox-72.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f538e71986429f574ca7fc5020911f52016b276a703ec2fc061665cd83728590b30e2bc1cc1d3fd60c5d1ef2919c78036291300894a4a538e1d81f2c319c32a0";
+      sha512 = "b4562cfd54bbfac093e872798fc503fc8f05952248f448a86a8a30a31998d4cab531b42ad8b894da41b8cc1b88d6c1e0b39b8e92cfb999e2c99057abfdce6479";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/fr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fr/firefox-72.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "f739e9f34d61c2ba11968cd1343b6292844cbe1237fca0335a7398f46f7654cc8531bb0f22cb0ac104ba00f419e154baf9202ab129ee8028a09d09e35a3c90df";
+      sha512 = "da6c9cec5089be3acba9d0ee4ec5456aa3027f8193478e122c71453c109a4356b8cbd9118a170f037a29cbedeeab99b1bfc213e57cc3aebaed907fde31fa5e2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/fy-NL/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fy-NL/firefox-72.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "46c460d1329899a8ed165f13173fa8b80a9c3a557a876a8baaca1e344d1e8337cebc736c0c147494806cc0efcafe18baf8225e40253d5a995ca0d38354d013a6";
+      sha512 = "29b83043e60ef499e75becf12f8b60b855304db7de724120dbcbcb440b0379cabb766bb492c1d5f9eafa2f397cdbc79bc7806793dcba28666597746d743810ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ga-IE/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ga-IE/firefox-72.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "bd94bf1a7eb0e99c11d59dddca802b85b83ff1b422f947062960c22728f2f04574ab90ecbf5ca0eb82ceb463364d5a64021bf0bf061c5b95a35b661e3d57c93c";
+      sha512 = "22597f1feb06e89286fca9692c4730ae570ec71f2558ab32d4eb0276d970944afe75cf427abc95d1192c37eca29a27fd7cc6c917eb70c983b436daf79432643c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/gd/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gd/firefox-72.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "bdde214b7e2d4183b59e10d6613136761a6b661dd51e7827e1277be2e05726314657687cf95329f56fff5bf596079739915a71ffdf97b601b85c5d71979353f3";
+      sha512 = "96273c0ab26d305dbeabce65e0b7650113edde2882297079527a9802fa5868ded25b5f21af07fce19992b3b3821014f5f611ce2b264c952080e0b8e7867db389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/gl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gl/firefox-72.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "c742b5e17077ac77f8711a38797e484768f2f7f5fe5e533a63cea430ffbdfca54a3df2d0abb2a584a94b8530fe4b5a39b44500b5c1c3c9dcf073eb3881c212e3";
+      sha512 = "0167a4bb9874e1b0016c464202f14a9c1057a691b6786fd15e8ad44816a2e047728edb987f2fa68bd993583e9d390cf9e1553a8df7d19af0b2a303c10182ed27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/gn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gn/firefox-72.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "dc18ac9afd198558e9cef1bf51f2dda659756843ea77263c3be844a326f12a8df011c0c0f0e9553f13e8d4a9ef5c54a1a55103fa37f5222e4664911a87615f22";
+      sha512 = "e58fe8062a18a08d57c20d81ceb2c8c76c210d0fa4e00b10a2aae3bf3e6fd548350cb42e9f4f27aa06a21608976520c2c00533f060a30310e8cf78d218bf08b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/gu-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gu-IN/firefox-72.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "2264baa47305e992e4d0e357029f3329736f7510da2f375b1d327e63f60f46996402107baf30baa7800c73162e43756f62fe8606502e25ecb5a5471a38687b00";
+      sha512 = "13cd81296562b497b69df87961fc7a16b701d14fd35e8742f3bf15ccfa144745929323e07c2d4d121940aee589a281e0e90d8007faa638b34193a401892b67fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/he/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/he/firefox-72.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "6212701e3a6f724b0b022f6f8daf39800227736863ee9ed8c5523e56636514a4ff9bf58ec7581ccade4dd132acf6d24b986a2e356a2401a41a93c544a1a91bca";
+      sha512 = "6ecc9a96ee3157bc183bf3e6cc252f87e84906efd7072a413c392df27869514e41d37bb1a384b3b1e107281830a0ed9d74339cb4acb5001e98c56271a3b57fd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/hi-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hi-IN/firefox-72.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "b586f9e5f621a4c284973043f306f2681d9b324a36cb6f0e566b871037452b3497dcbd55e7fd48f5897f2232454fcacdd4070cbbfe36e458175effb42611556b";
+      sha512 = "23dc8a041f08424c6895c151584c7db9d4dacc76f9fedb2adf91d0fbdff7ef43bdffefdbc06a11d565d15629f3794e40b07d39797289d51394c47113d8054d6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/hr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hr/firefox-72.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "ac0b3ab1a085988a51f3c804d79077bad791e45295c54690f04bde1bef2c220b227d4d33055ad595785c67e2c3c398d61b9df379da32556294ceb2088549adff";
+      sha512 = "e9cd1ae6a782965a4e79b7fb3ee17b2f0d09d2faa659cad1d34add2ecd2645e88006980a8c2a628ecd7622515b1c50c23203c3bbe41801493f767e2c5885932e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/hsb/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hsb/firefox-72.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "96abaddab6c5239a411514e14443a1e823886ad3d374fbcca321093f390907fdf28af8bdceab31f50e5127ae1e2fc5b37399c323ffbf20e469a390a04d5f561e";
+      sha512 = "24fff6f98710a3729cb4a82a765a3bb4672c4cf5f067845732b6656d2d5c5f08b7035b6cbb341f00385bb0119d7d81cb5ab275f42f4a92533b4fabda161d2967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/hu/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hu/firefox-72.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "097f822ec0db715846b582bee49a65f611b89409365bbe05dd8c4b066e066a76960966984f44dea090d58678a35ec44b350a9263f50250f3ee1dc7fe6de0169a";
+      sha512 = "0b02c3e55ed81c1a07faf11e159b00987c46cb2225f3c414b824df4fd89bee8d199aafe7f2b9ab78fa8683364a8c30ef9a4b33103310bae32d3fb4fd0b2708de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/hy-AM/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hy-AM/firefox-72.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "874761d38dff94c038801a8ade916d40772ddf5e571d434622b8510fc21653591b295ba188aede50869452121af5b4e611ed305a6bc3044e683548865096792d";
+      sha512 = "48d3b6e4f06067e76e7c33daff9dd04b1b1e4745b4c6814880dfdcfac64ec71e378271e963b05cb48a89d3e546fc8bfd607506c783b5bc1624908beac89c2588";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ia/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ia/firefox-72.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "e9349a4ec589f73d3b70395afc3fa678817322b87a97c3212a436b768b7edad8a6821784b920eece1dc7c17fe310f1d8cab33ea65e780657d87116d5ccebecd4";
+      sha512 = "1f99776f7c6f5b3786d3806c838a6790e944ed83c42411f79629ddd54b0906fefce18c355b6c04b7799911fef1f90cb9296a0bf1d17ab489370a1e274be6eb9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/id/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/id/firefox-72.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1cd006c3ef0e0c45a91a390612cdacc46f6983b58ccb746431ba0dcb94c22ab4a36d2bf4e7652bbfa04b9ea0e50c17e72c501794a11e8dfd9a6389497804b5d6";
+      sha512 = "90cfcfa0a6b4d791dee1016fd64af7b195a078c57c4ddb0e2b0e81372d71d0266f592b49cf6509a02aed6e044e0f50f898f09be18c4b5d1d1611789ddcb3b6da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/is/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/is/firefox-72.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "616eec8671a725689e730549ab959f054a32ef6d7c3cf5a9cac0826dcb3e0d5a70a14018cc7a126378d3b623050df763a94ffde481c40e19c4b8dd0e4a7b353e";
+      sha512 = "fb9b33dd73e81c80f035f7a47f49a45c7aafcca93dff1f451107a86e9dc566159d2a15fa3a4045ef6a095e2d329956d02e9fe1ceeb29f6ce0d6527d6a383af3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/it/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/it/firefox-72.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "b3a1204d5eb1203e0d2f430ba7b7823e24beb44563c8e7eaf225bf2635377107170dd710e945327f07b21ba14b4a597221dd58880d6500c9997fb0fac35ab2c3";
+      sha512 = "cd73f16f1f01f4eb3e1f121a054958c32147baf7f3f7f856e4f5d80515efdb38bb901814734e5825e63c19dec7dc27ba25b4a682430aa8de64d1a72bb24e4533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ja/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ja/firefox-72.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "19b0ffb5b790faccdafc528ab43e91d3b542e71db206a280f83bfd748a7aacd808df043c6acab22c51a668cd2a0963523bbf23b375212957bc55e2b2a753e355";
+      sha512 = "0deea9508673300957dbb33b644f4dabef47a4f502431ee51ca7e4844c7fc5504f59bea5416c70eaa713685091c9af9bb336f0416d3cb78d251f87a3b1d6d194";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ka/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ka/firefox-72.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "009385b68f28f3a5e5b7a700d97c01f42c84085bde4d92b0079d3b8f3046608a61663f80c4bbed6de8e998c6cb1c0d0cb228dc8ca35382b13f669a2d9e7d8d0e";
+      sha512 = "00106e34b8353c4e19570e284364d27765f2afda9de181518f33eb5a83b703073c3bbc8a3ecc59f5828a91ae78867db0cfdc1fdae6b3393a3c1d63668d70732a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/kab/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kab/firefox-72.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "30c95436c4431208ad491fc500d97b5f0afaeec0f22e8ffd39c5a07cd3554e47db2d7ca93db13caff667b9ef8ce048501d5121fe61d07070e5e69f66614f2a01";
+      sha512 = "e993314ae7d3e23662b8dd52fc33922bc25c29d732217e7c3bce051faf0aff43cc7ede1b91f8995e51e6d20eab8c1cdde980f35d40b0105312e215d2509f7504";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/kk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kk/firefox-72.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "c44c7387a4f700af64fa23c4b643f57098f840cacbb149dc68a517851f2087c2d882d1cadf9b147a318185f3b657fd3aef5a3b22584b4de0fef30e7bc8e31417";
+      sha512 = "ac0f49449f4b296ca3de4a905c667c0eedb7557b54c3b1c27d6494cbd952ce0d1aa61d73271d88ac0a8520ebe4c2d4454ae9742bfa2b5c7e32443a6920850d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/km/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/km/firefox-72.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "edc5616a85b309c390c426b96a60658be350a0ebda009f25067c9c7ed94d5c0e1af67b7c8d4d6cd4df8e34e9296f04879f5912a8f6b743bc0ae07297fae5735d";
+      sha512 = "e5709bcbd40481c3198758813ef5e5a9cdad6e256396174cbb006eafcaa6165efbcd920fb91dab5ab415d19e85b5f7a3cb649f4f3ad9035ad773ab51a5a41009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/kn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kn/firefox-72.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "47f33f81864ca7dd61d3bdc2679a556f0f42df95dde60327b09a6cd1815ee989518da2ccb61104e258e404dbfb68dae99f9afcd20ac835d010674aea4e44d820";
+      sha512 = "6dc7045adb63e54374dbb6f288bafd710f54f1a637a3849f0c2dd243043e6373ddae941d88a8ec25cde643d0ac856dcc57b75d97356eab29ca01831d0e042724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ko/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ko/firefox-72.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "51c6aa7bd08a4326f4e835618ed8841568f731f6b4a11de2b39a989670e50bbb094f54e602484b7bbbab46e7c55ff844d02f1e56897993a54ed1a26f503e749b";
+      sha512 = "f3246f4a1da0d019c0456b03d8837244c59cd7931f3766c3f513c9ff9d55d390869ae508c0713bd8236fff562b9becba4bb4046a50e6c2f23549b6b06c800688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/lij/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lij/firefox-72.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "5109dffec7feb6e98b309b97dec3fa4c5ef11e506bb28cff8bdabd61a3385267f885f68b0c67ac269feddfba6fa107de7af0c95e9d38093fab2e52af7f294e77";
+      sha512 = "7a7aa021c32790fe844f258a55edb51ea4b13ef26d1d7cb2fba609cbd1f09a4b02c227eba639971bf4663d1fc8b943403eeb95839d9ec53d15fd6316c84aec20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/lt/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lt/firefox-72.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2af5965fb3b73af30d1088e599020ba7dd9fd00cc63c9f7ec3d706b953d92768975e5e78cd1bb5729194db359f33ba59672cd6a01fd0d7799902ba1017cf4fd5";
+      sha512 = "d3c8d20b7311586dc0693d169b6d47612136d8ca40b31a35641e61f7965778d52bcfe68abcced8356e31d66c2fa208560e8f37f1d7e3621f511721fd7162ce58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/lv/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lv/firefox-72.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "08220de53bba3519db1c2155189234b822082763768615075396bb23ab970962bc6a5602486db2d9240ed3051b4bb11b85a1ef95e10dbee67781962a66e10abe";
+      sha512 = "3e770d4f829abd903dae078526918dcd29fbb0b214b1e44017b32cc273cfc9a6cf626f61d6a805e508d37eedf2ab7eb51fc185d0c34be57fefd842b5f3a083b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/mk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mk/firefox-72.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "fc8869cc3e696356707b846dbbe55b0faebfbf3e8c0eb8ab498bcf548d0b12c04f74413e8a5512c15aea0e7e5ad51d193e88547dadb921fa6af98010a8f620f4";
+      sha512 = "d6b5deb5cef689500f2ded676145a6efb55e301b6718596e127f45b1e3743a0b7606006994f62a978f0d94789f45d60006f0b45e6f4e5444948388a37a1db19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/mr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mr/firefox-72.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "303af61561fd54638c1371d449ba23df16eddb4d18a83ddd997d99652e040ce5fa2208ccdee0242e47b25d609fa2cdb391de124340a3782dda965d1eded3d303";
+      sha512 = "4def7628770de7a67cce3c5aea45c718ea3f723ae7574d97bc87a4ef41350034abb0081887c3f335699c45a381e0634b1d4b41984a479dc0f0d5ced667e876ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ms/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ms/firefox-72.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c9ce87194ac3bbfd30b8702fe2496be9165359eb1ffccd6bbe0bf98850de9a3e2798a921d9996546bf59fdcd9c4b1132d55fc6a62ad671baca5143617dbd3fb7";
+      sha512 = "9713ba2651191cac976aefc43afb3cb640092dd738d9ee9e7518839170281e5f769d0f11b643f70d98b5cb74eac211e78c086787f63ec583636b0b02058461e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/my/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/my/firefox-72.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "0c31569c512e84aa052cd7ae5dceb164e0f3d48d303848dec80c4490dd157c08889b126ed354075d06d375b3f838437da56d018ae1288a28c30b50e34b4bffba";
+      sha512 = "79ed96b7225facd3c759ca36874c42bebc8ed21856a8d46b7170efece2eb48e860065f21295a12561e8e20c2f56734189862420b1278fbf722b36e21d0e2100b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/nb-NO/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nb-NO/firefox-72.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "4632a857180e2df8960eb343727970d6da5eb2d0d82d270f13c337629217a959897b2cd013d9f0c6d93eee54e0245f0ea6bfe9a9bdd12f8f84455cd961d53631";
+      sha512 = "12d0b02ae7953997514629a739d7df4c0e5d0b4006dd4b09447ac0710ca5d043605a5f060499f2b5f51689f101f580e7565810a4c1d0782ee408fbfe6925aa2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ne-NP/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ne-NP/firefox-72.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "e485ee72e51359136c3aa0d9c63821ccab4d547d61d15d7db2ae92c139119ee09207135afee13e63e4d651edc407d7aac2e068f559162db0fd32c4850259859e";
+      sha512 = "7d3512fc9cb2f6af9c47c27f54595c957515dea077a5624685f95060783fce7a23bd11ad0f4f74da52345de6704582c5bcb9a162aa29d700adf3feb90b0547b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/nl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nl/firefox-72.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "5e62d06d92784522d3cd38b9ff584556984d3271c21ba89fad8f92b74bfb7f536aaa26fe86d24a8bb8af5123865af1e9cc801459fa9bce41281ea602e5495323";
+      sha512 = "5a74e2ab73546a3754933adfc5846ce7cb81fbf0f955ef10189f5da86e36cd4a919cfcbf5b34f0e49dd9a0736b402c005591d9f3270ffd5dadec887df63c272c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/nn-NO/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nn-NO/firefox-72.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "fc2c4a165b65686b0e7e6d82bfe1fad78fec6cba85f387348f3eaffe99401ed4e1aff1b1515fc12030351943fcb7bb621b7c4ec3e7a8dae9d51719ee69cf1e16";
+      sha512 = "59684dbc041f9cb97cf1dc6b62cf075c9e09c27a213d79faa2da7e3c76120249f9dd668036926cace1bac2e386ed2e5f2477dfd29a16d4628cd3492df3dc1e69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/oc/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/oc/firefox-72.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "6a65cfcd9f69a14d7e0f3a95e0594744169bfcb34a77b5cbac3475f79c134d5fc7d2c77a868fb9780d271cfdc5a0e487e35cd20a5b61f7f7da2c0109f1399f19";
+      sha512 = "13aec175cfb0e99ebc64a3fa00d96373f578c0b40e9fb748cee39a6e0e38b884c99010426a47835b04ca76f7e14ae690425226eeba0cca828c4e03f9ea9478a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/pa-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pa-IN/firefox-72.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c5be85c65e1feaa358ff2e51481a2512c3ca8c8d3ad306da749a9abbf906c7e49a7f0fc88f612ea4e0c19c7f3ccb860dbc5ff2af01e10fb71783d9ca9d257af8";
+      sha512 = "5350381fd1490a9d77bce592b5fe5bb16ea806a19a11b90a6d4458dd5804e291be61981ca6358db4f1c61e7b221bf6032ebd74328080b72c7ce7c69b5dc8c6f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/pl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pl/firefox-72.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1b824c4d039c0766be5206436a2b5705eea9aea423b8e9d83fe95d13151cf41d8178b2e7005a81b868a40d3c29f9ae7966c62a974a55191985a60ee362a2ab22";
+      sha512 = "73ff9ebe12ceca06c338c75d01f187b3c680d33b7a1ccb9ee9206b97f6249d95eba3047d7e87f01651e4c5e112c5c59be7c50ef5451b6f9e6c384d94d3ec23b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/pt-BR/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-BR/firefox-72.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "2004bd2c6c70153b93f809c3e4e0bb37fb178e49751cd9a8cc42267c74ec94a3fc4f6c9d8540d36cac629e03196dfca1a3e4c42e2669d2301ef4ee55a68019c1";
+      sha512 = "3660b8376970fb9b70a6d99f68225420b681900e3c3184a503f577cde29e05c94dca80ed3bdfd991497875006769ce8a1e973276dc302e6bc0a8b68472c223c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/pt-PT/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-PT/firefox-72.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "28281392897802a403191e42c315020325f1bbde8f8a1314e460d49d55537bf806e2e88de6775824815124bfe6870fb96f790c992c9bfea8d9a43a4c678df71c";
+      sha512 = "fdcf089be16988c3b31b9628a08a7c60e87913b0bb44a21abd9267358b881c5963694bb956c0f7c075ece3e6f1ee89f814d427d0965537fb75981475806ab6fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/rm/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/rm/firefox-72.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "6a09c1a14f9c53248d7b6d78efdf16d5d7f9ba83ac572c6b9b53b1cdbf393f0a2d0d9674b3e351fb2376ce13f250afcff0b9b3827bd01d64909c4b4c375688dc";
+      sha512 = "b38abcbd3da1b481bbcec3caf1dd948e7f696099740e2386fcadd13f628cdc45177176915a8bee6d5024b19e08a43de99fec7f8296839a3af14f4e80c2c69406";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ro/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ro/firefox-72.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "925ea33212f3208091413f5d5507f2efb0351c6aaaf1a3b58664e85fd3e7d7cf4917411c47bf8473d9f406c2ea6d5c0b82f9d78f0396b785d05d555c6e3df32f";
+      sha512 = "e0b4a164c9a8199309890c541a72377b852638ba1f2bf134b367b5b82945008e72b9d12db49fce800ca0a5bac3d10207b75059a9463b9f19d9570299f66a8c5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ru/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ru/firefox-72.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7a39ff663334c4c5bc4e2c6c03cfba37cca615b0927773a94fcaaf3461367c87953ad9ff429139430a1944971c7a88180f3889b5798f65044ab5daa751a42055";
+      sha512 = "ce71732d95d5dda49e80d69b1e363e6e623a81917d0babc01e24fb5e81aff3453e368ec901898c22805587958d833fa9a2dd2e96f73fcb37741ea518685f5df5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/si/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/si/firefox-72.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "408be66f1c77ada2d80ad80b8c537e93156dab48f10f732eb1e680934e0bb5c3995cbc63269f60080134cb53d8ba95c3243f66c6f7dc1cef1b80161afd6be609";
+      sha512 = "aaaedbf3901a8047cce09f27f05a7e50b395dae2cf31a155d7b3e027e8edc35ffb5d580c03f8c6a56ddad829da2b52ec1b42f146be183eed022a0768c818cd45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/sk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sk/firefox-72.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "001e0326a8e090b3f4994da9a8f09ca70cb87759f3a5f1eb488724b6070f2c62f38e7eda8345bb7f0b8d168982b564ed74b8eca0bce6e099931f16489137add2";
+      sha512 = "a5a1296e053524ff1aa3779b123406e179a0eae38d7a5b34fed1acc6f70df176cdac22050afee59a7e80c79cedb7b86ec0549726dec9044c7e3bd0a087587b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/sl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sl/firefox-72.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "ef769cdf9721ece1915e4064e7c4f0a28da1c061e8c8dd9fa6e7b5dd7c88e4fd73f7a6dfae4b6a9ae3bdce8688442836040a5d190e44a912d3bf1fb5bc520745";
+      sha512 = "b360d85da7d2d8236dd4c731f43417364393b3c379f0b4b88b7521598a7cdc5ea73ecc4c58ed71245e53fa8b2d9b0345f054c27d55d7d1979ed3d97681578314";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/son/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/son/firefox-72.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "3c15fab6139ab38d3d2dc530681de715eea187b6c86dd84d9b50035cfbb9ea040c2f80c8572c7a7448efee2f47dd51e3d06a3521d787e2902ff7d55cbf191e36";
+      sha512 = "b92eaba0eb03801064258eb5528ffe46115ebd6b6c7efa6d174b48984da527bd542804c7a5edbf565d724dc1c66b464acb0b83160b4a01e1f845b37a82eb5624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/sq/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sq/firefox-72.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "9c96c28c094fa58d41c7d3aa1dbc635e8b1dd960083ec0fbb74b7d15267276f1626dc16283083fd3537ffd35ddb5265713d6055590e02e84b55144c9a0794a48";
+      sha512 = "5620a2d17500a7a6385d93dfe8496dfad466ac415ddd871f82baceec799c02b6dc9291aab8799d1938462c83507d54ce3807de42a5a1e2fc41ac780079a27160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/sr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sr/firefox-72.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "d608f85aaee8262e7dd5988f524dffcd0a3067992aec04b5260c5049cc130f3bf057326aaa52b569d851948eaea2fb28ef9d83aa4c4a60f0ef4c9802dabe4a6a";
+      sha512 = "79a01eec8ab15e0f3b7cbffa408245abce4e48f91ad1f81520fda0c9f66f2a5ff483864bb1118365d0a24818cd477d6bb992563e01ef704122387e1356b00c20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/sv-SE/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sv-SE/firefox-72.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "e13c55f2b570b2ba4d5ebb28462c9a65d512c65f7df950942e01af70bbf3a24e52920ee61c310a193ba45fa0cdaa1bb895b098480e2f8caf63eb97904ceedb10";
+      sha512 = "31351684d7819ce10dfbce8198ae5fb58790f79ee94e277b684eb914b59a686a1eab7e8e8cc3346cbc1a0f630bd181194d34d7e4610351e9d783fa56909d73eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ta/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ta/firefox-72.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "f8c1ed3c0384ffdfb74651cb433d6d3d2f0dacadb80e8868e82cefdf6523a7963695af47fa4cc46263c07564eb25df3fbe98781709d66915ee640201faafea4f";
+      sha512 = "d3204472eff80b522bcb0e8abad52fe1cc49c778f5cf0766ab45b5ca8e5bf2d60e561b1f72745b7accf209fcab9e23d90477a8388044bd2919c617fe96de3174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/te/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/te/firefox-72.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0b332bd6858dd677d0572783a92f9e8aa3098881f9683579a447c0424de3d1ff42805b435b8fb96c925495cb6a9efbd4a64c643039b689dd05788e054fe1230a";
+      sha512 = "a4127d25376e59b67c15e4dcb660262a5fd651b32989e8439de8661b026fc1a96590cfe4bbea9183cfd7568f37623face2e69489f398fc5f4601f8ccb17c39bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/th/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/th/firefox-72.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "cf5d207a43e3ff879b705d31d09c6b350b4bd07546b26ecf81a0ddf7aae2ff52bf33c9b46d6a68cb253fd60941fbb4c0bbd88a148c68afe6d7e2496635e4c80c";
+      sha512 = "4b13582eb740408fe252328f00bd3217456f406cddb131912074112d59aa2b1b97a056c71e2c1f7030a29ea82c0f4c3240ecc4ffbebd104e8544fd4eef51133d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/tl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tl/firefox-72.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "357de95fe201cec31676d2b8f1886f096cfad09a0c85bfd0a7b22efb0ed9c61a81dd61e33eb4f5fe2fcefe869f6f5f2f2820862b4d12c617da51efc032d3eee3";
+      sha512 = "48312b1d86756044a19c47d30ef662f4fded179cde72d9f82f47fe4fcf38df29f5f020dce26c8faa37bf5eb3cb5f389547a0fca3e504edd934ad7a414a1e70cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/tr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tr/firefox-72.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "8f35c2debbaf88d01ee2426b21c84abd7aa2888d6d464dafd5dafda5fc27acd2caac86acf0fba8ebf2798ae3c24b0e9b7831c40e89123dca855be413eb1f8417";
+      sha512 = "5ebd816cace4f8b10a8bb3891e4dc3fde9a60c24945a3cb54a05a5683c15f9c1710c427f31dbfd7ba3ff035d6dcce3719c08180e4fee8e4022b3c91c297c35d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/trs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/trs/firefox-72.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "74a02e93e892dc5e52e4609104d70808c491c301aa30070f0975f818454de39dbe78f5e193922d383ce01e334a1522b952a8d13cfcdd5699109ca74d1ad3cfb5";
+      sha512 = "993bc4ccb6d60e93663e13df7176df38682d5980c2b73ac2b7b43b05792a5dae88d4f959940405fecfa2e4cf8d11ac07838f44cd03db395361ee67af4fe27a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/uk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uk/firefox-72.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "3412150426f735a6635115254f2e29e36eaa4f43ba532fbf7d78c769d53fc1e181d1f108a5273756b2a036be38d5bd3f4486044b3a4833862e71c600451b3f13";
+      sha512 = "8c61661884089446bbf0359a89550b41f09d3aa6ce9d1f95e7fc0d2d0d3fb6a232f3c3fe26f9124a88af981eec9bc6646030f97f0d412298358272fa440930eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/ur/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ur/firefox-72.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ef17cc7ce86ccdfc411fa9e75d46feec89e61a3e9c0923f9adf3066d0093090c4ab7db7ed598b93f2236954d7b3f8e5ecff7f1699c65c9382727b239efc0ef41";
+      sha512 = "64b83bd3057e1d7edd804e948626a1d6c6801ff0c91717140d75da5778c4ff9afb52eb08d982d3e9474f9dc1daf8de5887b2ccbba41e490b567c380980635564";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/uz/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uz/firefox-72.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "c4a7a6063b92ad631fdee795037d76573b3909287212f4cc40a581bcaa5d329c22a2c4b38d549cdbf8846bd5cc5312e0d9726be87629ed76e11d2b5db13c55ac";
+      sha512 = "ffe82703e4d66ccf612ac616fd94befd35fd41d26f2dba2d1cd269dc95500dc762c85c3fe2e881fcd8bae04c75486edee55d90a43c0b6c379eacf1f2270b76f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/vi/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/vi/firefox-72.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "464dfea04faf08450d14615948644b1349e656a059d940ca6c2f102cfa5b57b2995b961b79b2bb1c308c0ed177a0149b0c94f8bf42839d684be7c9c528170d1b";
+      sha512 = "c4bea8bb131ea97dd52b3849d1edfc36f88afe5550c3a7ad67b2b0f860ded462834b62804a92823149c5bb4d38a76e1e239b626d15c48dd388e9eaf232d03bc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/xh/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/xh/firefox-72.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "871fcd388a9309381d9d19878620d829fd8e914f13206e3d924bb0a049320a9d033332d62b7172f0bd31901e32eda0f1ec23017d7ceabdf76fa529c4444f2406";
+      sha512 = "74e09c80cd60f97712e4b5a374b9a32a1bc99c160e34a324b360afc3396d057456a988e8706139ac62525ee8002755e8a1ca52587de83028340fb6c767f1f432";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/zh-CN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-CN/firefox-72.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "fbde202c492054ba28b3d5387c12cbc7f29a9a0c49fa6c53e39495324b501cee35dfeda6adc4023ad7c992527c41f868755f3cc216fa0a2d71180a8f7a130994";
+      sha512 = "d922dfa80f19904e8905a30074ad57f124c4cf81fcfbbf157f6b9a775f12943909584e21b1ef247540f26e1f5392e1e13852e0bee46bc082b0038cee15cecd3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-x86_64/zh-TW/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-TW/firefox-72.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "35b5995ab0443832eea07f3c164b29def23e213774e28d36b70d78c3438ad62b17a7e8d4c54e22d21c15a6fea0ea97ac4d3ade91890f1c8d5255a3725e3f5c7c";
+      sha512 = "4e5fb29e77467554b767f4f59de3a0d4844de91955782d9a859b6b7a7d379c673325e1c6f090d6af477a67d8b91dbc57e5c3169f77e14dd43fccf2aba508db6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ach/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ach/firefox-72.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "2e7613bb1f6e321f64d59215eb5fd36b6fe0bc2950251c2d227521a157400dda00fe9ce2d17ff8d6db650f6b3ff075b5e32090bc7c92c0f0bc34f38085a85d43";
+      sha512 = "84669f751e3871de2ce92959b944eab1f4f6e808ab275c20389eb253c11815548d4c5ff766ac331562d13165d7bdc7498a1ff376777e98b428d68f83d09f789c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/af/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/af/firefox-72.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f2bc6ce77fbcd24b33e57801b897be9aacf3944caa2fe88a3c94636dd3c0efbe54bb09c04a2c98e25d426f734869a247ba00fbc0bb28bf814709b7f3dd802e97";
+      sha512 = "230e212b172566edc7e3e30e7c4d76b94abf55d2c6bfe1d64e75a5769b1d758770b123b77edd2315c4a12641b1edb12be2a7f080dd44a59fe1a3f05f53fd86a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/an/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/an/firefox-72.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "47eef64a2dcd87c776a49f4e4f962472e0a9b0b25ce3af14be06cf31f0ee2da6d215bb1e3786f9e806ebfa80cb5840820ce8239d9b417630637fc39a5742ce01";
+      sha512 = "af8a603d252961198255cda016b018d443226cf7143dbb7859494b871999ed1548efe6a8c7aba6bbdec0f8e0bcb7657e84ce3f12b45e23ab5df7067d462b1014";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ar/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ar/firefox-72.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3e2d21ff4032c35aee149acd2e81d8a2c81289be701d3c9473dc87a163c806cd8b78ac05a13e95bfdc83ace1a79615d724bc1fcb317748ae6e40763d0025384b";
+      sha512 = "70c4214324eceec873654620e5a6b9a1f304c392ca83e989030cb43541092d3a1ab9562d58bc0178ce2862392793f65c5adeaff323006cb24cb0e7c660a4d0b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ast/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ast/firefox-72.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4b6db32a734fd371d14954ada9cdcb853a460329a26c46937eb08549aa1fd3d6840b23ecbee65762dcc2d66c6243dc300a1fbc988f54773b29662fe108b06398";
+      sha512 = "af157cacc34a9f31f04b6fc46cacd7dbc9b3894dee6209e52341f4ad72499e296bbde0b2a6e1b6ce9400559260f9aad5e3ffa3273e56e046528fad7926ba9fd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/az/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/az/firefox-72.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "4891d270449593982501fc0a6a44fd5273b306912e935e1486b4352b1c73bc8d39bf22c58f073c4ea59912636b1a7cc6582e7179f6151abead7e32ae80bda03c";
+      sha512 = "863399e7ee8b05c1ad5a35aec88bc0fa9137fe2f1677329cf3ac1ec43db2d20edf28cf6fa07efde7ebac800790c2971dfdaa4f52fdccfe1ff77195f3b1c0a1aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/be/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/be/firefox-72.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "207d9f0562b46105d96be498b9d458ae88a9de92df5f4ebe5ac30eb502b0e959ad6652392de4e4349688ce9904f2743f287ac4ea1634a8015e6b1debd0e186e2";
+      sha512 = "0aa85d3e64ce5a27710fd2cf49abac8d63bca791f480d28480f4c0cb725d44a36f723f711392eccc5d1ab90cb150027a17b37cac5ed7cd099c80d8d7c1f1bf57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/bg/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bg/firefox-72.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8c180f5dc6e98f0f1f00b4b210069fd5265062c40c884e511e1e0a0a14dc6e50530c47ad67deda95581250500bcd3fbb3b69892bc8bdaeb2feee4032ee771a77";
+      sha512 = "b20d322b2955591dc56fd01a0f321cfdc3595533881e27c23ea63ecf6878dadc24f8e357e882d554b58c340a598825ce2325bf08fd65d174a648686992ffae17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/bn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bn/firefox-72.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "275c34985fa071ec47fd0aeb0a340ad3a6d829dcb5030f3850fb9c02f8dfcfe6ffa642e1e551c9ab9f99d42232f6c69b08e6da6a9e902822c6330262e48b998e";
+      sha512 = "3ca4fa19d0fdcf2110af4ff36be438e84e23f534f854ae2a24f56d5e3befc57700951c948f45f730e7439109dedeaf0f7ebf27c8fcfe1d9a14f886f5724d009e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/br/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/br/firefox-72.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9c5a9e7e4fbfdf264db34358a97a9d64fd963850dba182da3be914f2fd81e6ef9360e07f7541487599026df4b312c09e893f7b48779283d8385ef2c96f2c354f";
+      sha512 = "2d89f28124cb2650a78728e3860d206f627d54886817727884f60157c561a00773fc8688fff3418c76a6c2e4286b9d1277b249c6e5a7c9de03d9d1a62c78494e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/bs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bs/firefox-72.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "04a9741392aa3c234349dddea7fcf2f7be26ba8d39ba11f71222eb75d4aedd925c6de4dd1013ca1f53321d546fc7e9babc0fca8336af9689060bb75bfcd9635f";
+      sha512 = "e047abeba9c53a321484bce65617c3ce5def9ae06153f0317739e716d1617fed2e95fd4fb1959e36e24784b036d273f872250ce865975a977a25c0f98f054bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ca-valencia/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca-valencia/firefox-72.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "e9ec3916406ac3c3fc69f792b79fe267923ac57a9b6a2de8d883f492a83dcc04faa93dfc59acb632f7f0ee3cdf167664682721743ef62d58b2393f8ea85bde03";
+      sha512 = "91de80a3eb281ad887f5c053803d1869aa41e43f2fc7438edecbc5a8ede86e9e401e27db8e66494a84d4c1681f3e8a43dcabb3fdfad5bb763f50bff11c7151ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ca/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca/firefox-72.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c5e2a8914f70c633404653198f3b03078991a5afde0fe30d6cf28030671cd75eca6f34a1ca3b1c7db392c65a62d6cb5902ead96ded0e8a71636ba894986d335e";
+      sha512 = "4b94b5f074848fa6164f2eb6df555ac190846380ca719d09225b63d4e0438a96035f0b3cdf5ce23c6c39fce055909bb4d6ca6f056fb223b652193539b3566bc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/cak/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cak/firefox-72.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "1fe310fd841c7565690ba121f49f8111c75450ae06a13ee040ac959642b025c8f0944425e57a90150c8d5acbf68e79b4d162d014ad191b027cadbfd9d7b570ad";
+      sha512 = "4a60942861ff2a1a3992c664a425c1f957b5f6f3ce9877ace5cdb13ec38a04d843a822c3b07180d4907b91774d9f7194d7e2b8f4b5f807556c3c5735c1a20cc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/cs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cs/firefox-72.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "4e89cf9a5230541278dc19327e0a5a9f15a663f0bd377b2458750bf0df7457495ada697678e5a47012a329592daf18b785e4d71dc9c98e94aeaac6c280184196";
+      sha512 = "0a1e8b063d06d92c5a0eddb2aec88ca41029a686d4914fda9d4e7addae9b6acd03c0667eed020faad6a0e82c234fa97529a94fb0771042bdf363c887a9aec2f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/cy/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cy/firefox-72.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "c08e9fa79a2cbec9fc7d836c1a275099ae3ddd482685298d76806e1c1ceb99b85a025de5162061117de30909d0e495f489869792112d0496d501328f8136c184";
+      sha512 = "688a86f70b5d1901e6531414587453341fb647ec3a4560103e52c70fcd8c91dd499dbe716572ec8585c3aacfe378d64b82c63790b2f190e286ad1e0bf7b99477";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/da/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/da/firefox-72.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "6c90eef1e3da30d9106e7cf97e0969a53e59bba19b5212a94436bba36a428842265c2f9da58d467915ced71a0386f406ebb1ddc052a9832e0b8063d6855ab879";
+      sha512 = "84adac21cb7800d3f8afe3fe0d17492cd6a1d2e2cac60969b4403191ff0b1a8cf04fbe772c5a02fcc24ef93372c76b95fbe92f2f4c4b595a929397cb3fce2ccf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/de/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/de/firefox-72.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "b2684e528dab014152284e3c5aae5874c3ce16548bb2101dcdd91fec6831a486d883eef3673429b087feea10b53e4256c7c083f26a3d8e40e446f4a1f32c307d";
+      sha512 = "a7cbb78ce08d5783997529c61f51ddae197b9d7fa683847444d74978c191a2053b5845dc4d93898e0453ca59894cab4dc28cf9f79baa22b7a4304eea59e3f0f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/dsb/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/dsb/firefox-72.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "c25cd1edc62268ff5cf67f4f0cf9751846204d25bd97b214f8c4097ef87d71b5f7989fedf0d47867fe74b427c0187f8398039d56c6e86472d1b9fade73b0cf94";
+      sha512 = "9d2821f99755cf024f4c7215274c6f3b6cff8c00ceb9c1d82f77becf3251f5c81776834a034fedd22ba15ea21aa606955ed743563a176632d592dbe4e55b7c0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/el/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/el/firefox-72.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "102679221b358fd7c1595a5f23a0eecd60c83ca37c00e4a765dfc2c852047bd17520af733424d0c82ec116c83900c85e6157972841deecc3eb9eada1bf22b4f4";
+      sha512 = "69023e2ef7c3c5d3716421b603cbd85d7b812c201c1d1e2efb69a47d43de500306a0d493f9a8380bbd1490fdd85c564c0b2a9ed54d792ffc93cf67b399887fb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/en-CA/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-CA/firefox-72.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "2eb273a9f9303b6b00f42c6d2b1bb6bc7e657a73e5710694362708208d9d9292a88f6307fcfd5a70aa3888fc0c075c1e2e844802d0307be5c02c159d3c266162";
+      sha512 = "2309e3a8e2973871911757392806fb74086c010c374334c8169fd91f8e45664746d693f63a0376a07f529ee4160f4f75ed22f4aefce5deba39d43df30d683943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/en-GB/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-GB/firefox-72.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "efcb3f5305e343f99b2d62adb1d4972104a4920eea85caa8cc4a50c9193ebbf741acf2d762ac7280b1c99297746f1924444788b86e25259f023e1d31ef70329e";
+      sha512 = "8db7fb10afa8deb76352ff324ef44becf01db57acb01caa2bd7e69714ddf327912f4795e874a2056acae4f7d970b688ec4b08a4912774e88f6d67d11a208a977";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/en-US/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-US/firefox-72.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f30ba9e8bbeff878e5e07b1cfbdeeb7ad84ec93736005cd0780c966970f0af056fb1dba5167a3c8cd31bd9d680054d0901c8859d9764388513cd4145390a5502";
+      sha512 = "6665f3683537437a3487cded3219a8228bf58b9294acc205ae18197ffdf240a67f623d827795672217194f327c0747708cc4997d25a1da90e8131e8a32667c94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/eo/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eo/firefox-72.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "2c12b5fab6247d2072ff22f9ff6e25ed52bae0a9f86ea24dceb5d440ace5209d0ef7ff8c54016f06498213fa2c383c8f15697e386f367e4c209941cb67bbfe8b";
+      sha512 = "65e52bd65313c31e9d354bf35896d410123b139aa27fbead0e41bba2cd8bc4737fb4e12fd741429c209cdb31661eafb1c49509359fe333c6082d9c3346e686a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/es-AR/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-AR/firefox-72.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "74000cd852d7bdb54fc53816d14baffdd30100a3e4e5ac62546f057812631684ff1a3b6d55b57d8974b1aeae823e86a1a309f548a49a7b584db3e4a772822557";
+      sha512 = "5d680d2135e4ba5e7c6ce7771e8b3fc34d753329fb8034e8018af302d451868730cd5175aca40b95a47319c5299b8f34d9bcf180270dd9d2cd4ca9413d0606f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/es-CL/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-CL/firefox-72.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "74084ecc5d419e264b13b4d26cdbd231010632da36a2660a49df6343dbadfb9c7cc3b55a8bc8aa97937c6c4c156065fc4b85987c88d3bc6b12e45a3695b8176b";
+      sha512 = "a1e81b2a68ce3808630efceb578d6d786ec0a4ad11de5985febd811ab49e60a5c91f60d4682a4b980a658ee03683e53f55d338851d3a475507411b7092090762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/es-ES/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-ES/firefox-72.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6ed8e84c4f5b0ce3da7f9f7cf3753d95f2ec8cc0283aef88ef75c5f05a4ac20fa7cd70fa212092f6ad5971aa73def4d331b6e219c958fd0dabd672d9ba9b817b";
+      sha512 = "d7807a206fa3c169a3d36a9b41f8649b83db1a43b2f54de7d238fde37728d59e27c0f8654223f02c7f9970d358830a29776a4bba1ff2e25629ef289ab0612b4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/es-MX/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-MX/firefox-72.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "ec4154e7c84261fc1522fbe10a56cbfa56106d6c57239758ff3d23c83d2c676c070d01d91a57a18f6c367f62396335769b8793e7b19d85f38006c51ebd80d851";
+      sha512 = "bf0ac4aeb7d527969da7633a6142238c9b9e2c57612cf32582f1316fda1cad020a5c53de18d009db9489dbd781af5de1d1da72a6956b1a08bff3a149372b6982";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/et/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/et/firefox-72.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8857b3b4aa2eac6e7e8e541e5aa8f3ece586cc8136702bc10fdc8db00567990027d4bf8231a1f6b91de69f59a2e683298eafaebd1d8d9870cbccd1b87d45b26a";
+      sha512 = "3213ae4c41a450ff0e487f661df8716a6e6ba24fc29d41dc7acc8807f1d0af8e065d65b441f6eb47c3a2c2554e3848ccf83f786b69e536e44f6dac994d76478b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/eu/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eu/firefox-72.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f5448cb81117d9424ab0b5653fb9272abb96cdf3d563fdff9533e8d066850bf9c3df29a076bbcae99ec72abbdbbe5300bfa58ce9e9d228b6db62539f31987756";
+      sha512 = "90f4364bc45540c8543c38291de35013e6198918cc2e32016b707c6dfe96ab5177501fd165204c6386cc3efc7204b86bfaf131af9ab164c0662124a5149d4cad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/fa/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fa/firefox-72.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "49226e26b6940dc7ffa02b6816912de20d05e371c00971e964896cf093b92e8f1de355a17eda648b01e58f1c03a88179d18c903925d37986a5781a8abe4cf404";
+      sha512 = "be2e0aeba63a36348956862f636e6afd6c7dca6e76fbb103c91456737eb487dcac4073bbb57f45987f8308b395fb5ae0424b36b982e0ecb8d3ef90d259660818";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ff/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ff/firefox-72.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "3c188cbde07b11e99d6cd717fb83bfc2bd172eff696138a2e1922bc344e78ec78c957becf4419b8bf1fc87b479bf696f7955aeb1fc8985e18f784ecfeae2fedb";
+      sha512 = "5881048229f3f17a2c766c12ec4e734311f3841a3737fae4ad459c50eba5c889e98c4666f8a87074fe87f59c33603ad056cea8bda23ab449babc3eb230d442b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/fi/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fi/firefox-72.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "0ab82df10e491acfb072c4c991e41a2ff8967737eda1597687be00d48c1d3d85b17540fae457939eb9de923d4fbc3f959ff31e148010eb9c85ea66ff4fc0046a";
+      sha512 = "1bc13da6298705ad2bcd40ca0994b1b6288416defed2a8bafedcf5d7a3e0239a550540eae7e2ec6556c4ab5ede77a6b451b906ce61f753fea2b9c1cea5205e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/fr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fr/firefox-72.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "3d4b12b186c54581fdee04ca756dfbc5a772cbddf500910f66c6d7d85a5a3a7b8247a79e666270e54a3185423ce452b0d7d2c87f30d407ceab7cf24ca8fe8b7a";
+      sha512 = "c5bb1bf92b1f24a3bcd493a183ac70683b01fe7bdc337e96c41582c043adfd0f429f3eb90f543a9af98dbbef915e6a5e2aa3f90f96414828c9cfa30e58187aa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/fy-NL/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fy-NL/firefox-72.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "446f13993a9e14b0bb9af09295f17fda411367eba9d8184445121baf0cdbcec33a6b18feb0c1373d7af003ccf457f21014cfcb6a9d7bd74999df11c6da02f47d";
+      sha512 = "fbd38bc075181e87abbd457e5c763146e4ddb590004d7e76fdc29ddba8c3d66ae718705339bdb224bb782eb8633771f8c287ab0d585f27a37614f3a7a284d97a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ga-IE/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ga-IE/firefox-72.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c10f6945b5ef781e77a771281144289c00159ea9bddfb43c843f3de73b4063c930908af7c0d60a7c9681ba6c3cc2a61bcc8e8237abd8c615f5ce63439a4a0dcf";
+      sha512 = "c2276b743f3c5efecfd58bc397a202eb4efa02eaf30d5b18221c8de365e4ab625617e1430a056304b2c4a30ed901376e8ac14bf28b806d2c0b284bd732f546d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/gd/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gd/firefox-72.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "408ef04967d890da9bed3c60829fdcdb5b6fd0d8ff605904f4e563c7e8d971ab0f56e7d2f70db375dd50fa05d6d48889004271155416461b550fcd5030a4051e";
+      sha512 = "327f677c3d4f71c3802f515ebe36decf236725e1fc318f55afc0985aa800b206a5f7fa215a219e1c2c54ffd24f2f95baa6194822325aa6144b0ae1f8fdd22d2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/gl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gl/firefox-72.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "246c22a6fbd0c57fe95bda05f65d1bb1126f4969bbc626c475126fe665d86f3029de0546373690c43f972fb7556917e4e6ff880e294f699d949b84b82dcab7c1";
+      sha512 = "d8aef85685637cc5186c5b0b6f9458f29955ffea90725973efaaca806cb48cf817095e08ee1d2ec533ccebc6199e671e04acf460d1b8a88c795b9842b1a55be1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/gn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gn/firefox-72.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "79b84cd7dade66fe9bf866ec053e069c127c9c24fa55a795da2870fd21c99304be77a8ed249c1fa61aaa2644036d40737596e1db7714cdb76fa030c2b446295e";
+      sha512 = "95585c2c547ec4224841178f6cd8697139fd6166aaceb749abc444425e100961f230cf1b98b76b8774b849e6a10a37f1be3047d97e48130407cd5c27f9031f71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/gu-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gu-IN/firefox-72.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "30759375ddc3343edf4d5548c5e68da3525001ae1fe2120918c7a0e9ce77a5d4038d8083e7c5556ccc043b9587b5e048a9adfd53fa1a3c9d35c0ab4dc85fa6e5";
+      sha512 = "396b68a041957adb0a15390261cc152f41cd339511a94933ace779e5494a595ab36243ce533ed158f57c4bd2418e7b66764ce9c2cb4e93f7708fb29aa6a12b0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/he/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/he/firefox-72.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4db07da68a7fa44ce1ee23fad5c5041d91ed5598fa4fec73c10cb13e71771add1b56e0af542d874776aa67a714440459769f9e6a5f8ad7d3530ffc9ccc6297bd";
+      sha512 = "884ef44f1b5f017d46abcd268b87c6c433ffd8c30f5afb66cf66441558e819bda15d9843b7fba3413c8f148f6d8c583506b6a754d91e2baea70c5cad321909a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/hi-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hi-IN/firefox-72.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "17668e7fb3eecf5a9d9870cb634d7437d6081f70ee82811d08ba17d3b9c0bbf05c8bbb901b5e2090c7b133a9b5f742bd9de4d220b62c019e97c7d91ba847b0bc";
+      sha512 = "ca548c8b992d9c11a76f17b0790ca024a8c40893da10d50cd96f133f99459c981a2f2f37ad08f570bae809b6b08684d051651786840db33be4990f502fc5ba5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/hr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hr/firefox-72.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ab51419d8bf1397fceddf47b97b5223da65610dd13ab72b8c9298b514218149373061f8828a883b05d6f2d68ea014766a547142c8189085f8f9b7befcb4076b0";
+      sha512 = "d51a5454a6908d349b1b7239176f57fbd118d41d6bfe578c64bb9fe074628afc25acd1731221e6531a85a84d8193765d46e49843e7743f32be96b26180e9b593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/hsb/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hsb/firefox-72.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4188c372d56d190d2020e92a9f443fddd6e225484d4ff7c3d4aa78b3ebb7a9155809d5c0e5466946f228d5c4333adc64583b93616eaa337f3d9e279c2337553f";
+      sha512 = "19bcad2ccfc2c00d1a735a006c126f7e9610c979310fd1af30ae1d9bbe2e1b6a35ccad8441ff1a2c5d1bf7f4b006751da6f848415ea28cbe2c47b2ebe1b97bd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/hu/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hu/firefox-72.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "30ab854d45f6cbe643839c07a08a838a3d1dc871c1321da1597c913a4fb3623a9fe19bd078e20cd9ce848b3dd9b0f44c77626ae7f6321d60d5ccdb9e5d3a2177";
+      sha512 = "2b598a6adb47878224759492c1834b317ba6fd68839de83ddad835c09f5bdf92c5b89a71351b64aa9f8332f61d685ecf56ca2423128142e03a6904708cd693d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/hy-AM/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hy-AM/firefox-72.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9ab1d1b43b0f70196395701c0940a76fb71190826d17493dd4565e1c859e68f8754c1ff119ffdc56a680b809b23e1481c2e764810cac3cf1cee288b35bed4dd0";
+      sha512 = "76e940fd65f81be02750c299a2375e2252b1e2595193aa52ae6238a4931b08d461ffb2806a6c6ea7ac24a343d183bfacb1a57d349d4c57ae6e3f68ee09833322";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ia/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ia/firefox-72.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a88de0287e9cdc41ede83d7004fd0614caf479109abe79e1d3f3dd4f370b8f79a48f2174f3a229a897609d2f20d6048d3d88cf50a2934ba3dabedf96794958f9";
+      sha512 = "6554fa82b4e6e7dc20a5dc83148752661ba12aeb4ed19500a21f9d3e46b7cc37881b53ff0100c9f382b2e24e16dc99ce1fc338677e40ae4eeb3d4d1a9bc8ca80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/id/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/id/firefox-72.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e5eeac2e2236704a63680cf17c831076a99a993baac3f7a1b9381d8d6d40aafa898fac2aff93510179ca8d3f0dfbcde08ef7f6f99dcd017d2362750173c89111";
+      sha512 = "dd12e9a4cc83e13c6a7f49d7a52de3f46b4439405a28bdb855406394483cd90120a4b5ce9bd5df912a70128bbd532d158c1b3eddeaa1b7c95ca4b8334429d599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/is/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/is/firefox-72.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "c2e752ae20ff38177457afe87b2c80472d769b41026b7fd224a711138482b3cb3abcde4fa2134570ffab89cc110274cb8bad378445bd3cea77f35a825946c532";
+      sha512 = "01e7e45c6e45d7a20dfeeef16558684a6f38b6d97e84bd084246c17d891a19432f9fb77b7c2b0daedb12755853e53efbb0fa567f2f306c385d9c6e7e2fe1d661";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/it/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/it/firefox-72.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "50638f98c440c9ce73f298f10f9dca803fc7a241cde1afccf5e2f87701a28207a0d01fd90f318a2192174c8dce179a84f3a8c0281dc8f1c0bf6c5fd3793903e1";
+      sha512 = "e000567bccea7588af26e9e51883bcea340ee237d2626dc9e63eb241efc49962d60712bcbd4527caaade8eae7a64ead080e7df0150436f37aedcfd5cc212146c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ja/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ja/firefox-72.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8899ea60537da6da0d0cc4bf99ed406ecfa21183b94865311918c0397650c81dd36c474761c14e2981bce5e9093d3e905dc465141f62d14bf634c4dd392be870";
+      sha512 = "5bc1f2078288499005e189adcf2c6fe3fcaf3f642d624c2451da2611b804072771161c59ffb58021cedeabfb91415644a201db519e5d6211e78ee52f32e97979";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ka/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ka/firefox-72.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "146585388cfef7c339142ac54d588c790e1bfcc81a7c04ba47e778732a64fe5eafdb0cb00bccb140c75c1b6a2f6e3c6a3e2f700a978f4569b30c6434cb7ccb4a";
+      sha512 = "ffa42e8f3c098b199d68321c1354cbd6e21ba7f36add6e9000c8a2ea524f3ffd70ad13128b4c67ba5f376158dd87f7565a8bf876bb385481f823b5fdbf74d8d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/kab/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kab/firefox-72.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c94d2ceb3cca7c15adcfe4d282882c10a13123ced5a939566732a85a7004ca65d002628d5600569213f5e829e3f28261a25902e6cd1bc5716e732bcb82ed28e8";
+      sha512 = "0315ea8f56f8525f9758e919c97437b8ea8781e04a98c2a34502b98196c6b27030759e26098051cd4f27c96c7de4bee3f28ff8cf9ebc87b12aac7e7924a79275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/kk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kk/firefox-72.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "2c204d753f233548ba6409046653d8e9ef1476bf161a040edd90c5adc519a48e2cda1253ee8fa16b9a05c1147d7697dfeeeaa7700f01c072477d557102f58a60";
+      sha512 = "4c0e327fdafe298dcf897e68fbd1557bab24ddb91bcfbe3bf92a19662f6fc6c4c8862585d909639fc7a4c6bd4b875d52d8a6d0867049ca1b1ffbb00d8e8d9195";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/km/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/km/firefox-72.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7bed04807b6e6c90f69c6eb3ea53136dbbdb88924ec2a13019ce0660b3c58f001db94cf8054f040581cdc8d5b9589138542b13b8408da0e8167a89c1295b19c1";
+      sha512 = "34a45eda40d599116be8f320ad99e25dd2d9607d91c99aa8b1eb5b05eae32dbb526391a4a08ce5b8d411a6d6fff23dd9d01e276f75653d9c2adc5a4177511df2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/kn/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kn/firefox-72.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e7db8109668c0350cc5b970da5149072676d6f59ade68bf8f90ef15d35e422c6d102b8cc9e7b5de5d92e14e13af85dd47ccd21f98c974d65d65502a2b08d3eb9";
+      sha512 = "6bce122a0a2a88ee17b29ad2e98e99293c077fb70ac63604b407f4426bf39c9ee3d91057b9e60df6604a71183a266fa7f27bda01c0fa60bde898872d5325e9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ko/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ko/firefox-72.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "0687087a4f58172a69f487ae395baf362b03725eb4435306531ed848d552fba835aee43ecedfa3bb8bf9fd518c324727a6dd9e772789253135c46b542ebc71df";
+      sha512 = "3b746676d728ebdf3dfd646bf25b007c61c7ce960f7cf77f80601cb38e6fb56cdb6d6d7ba36e84f55b7969f2f8f882def133126e0598b43ac569380cd897f2f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/lij/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lij/firefox-72.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "d225a4b464f37b45463069b571a78c250bfb242b598aba681209255717113904f3f4466e0f20b8e34a96e1a00355cc5d2ee65361e5b252275962003bd0765f52";
+      sha512 = "453ae335ec815eea785d822ceb8224d590b8615b21f316ee7f6c06e9a0e02c341d26b9e938fd5eed60727df719c8d8394df312bb28868cd21ccaff60d3212d9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/lt/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lt/firefox-72.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "3f0a5c0b6ccd806971d902aac4e11ea1b783c7b5a121e2d92c08ecad14d36c35ca56779362e2cd73e91885a6ff909314d44b290149378f0046785b39b6520d69";
+      sha512 = "e6da72f2ff519a0e348ff8c9cfe7a29a3253eaa16e8ef58fac79868b9e4e4ff9fb453e763397209e0490658005ecd2d4bd339b366afd7f8936d51186e55c94ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/lv/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lv/firefox-72.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "170a1f7152f0c224e2b7d0b0be6d9f93802c1ae76d6d5f3adfb86ef6793d23218c3874d912dcbbc2c77d7e9a17e50b53e6d265e1a69d40bb71bcf44324dbc8cc";
+      sha512 = "c9f958bf85e43fbebad9b9dee033cbaaeeac010065a7b79c6b4e90967f16ab747f4fd0d01af4316094876eaa80b35ad67b6b485ab4b02a3765ce3583cbe7eae2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/mk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mk/firefox-72.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "342d83f45f97eb89c36d3ed5121b11b21f48d8b79b84e50a44704c9a3b11f428104189888ce6b0c77070b256f30432f0b1365af2016675bbd15403d14e439e33";
+      sha512 = "3c936346e9f915f24b806d299bdb2ab665d03f3d2c12a7b52506109ed1aca4f87fd3a099f6fca6fba1bce46784bc3a93d54ed2d9e8b704990bbc757bf4e1b798";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/mr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mr/firefox-72.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "6faa239678801054aada6860d4b56d708db429a9a42bd6d5182ea8b13f823264130831f75fd77c20c3ffaa955fd47cb97fd4ddc8edd486cfb59166fbbc04421a";
+      sha512 = "92622561297d3e8dcbbe56d2333f3b46ea66cbd72efc64c20c339d33046244e68f98687a9c5b5c5e6738eb6e88d392781cb1c56d96647e454a7e1bd111761ff9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ms/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ms/firefox-72.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "798bd9ae750c2825f538e971c59775d9e989c32576c3abf096e33ce205650248912468769b43fd2e02a03338ecbe24ae0c7a1ce89de059ea113be04af4797696";
+      sha512 = "9ba4f473ca8e56576d4c13e467b49f7cbb2f4af43e78406361d4222a74412f7b336419da504168754828796eb2f5211fdbd0afd8f6bf4030aff7a9855919b119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/my/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/my/firefox-72.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "27714b0bcbc636ec08f6fbad35ea6fa047b39d53e887fed95ff5d3b5a83aa3f5ecdc5081f08aa171feabc5d2eac04dbd0a7b523373341cd6f0448f15ce81155c";
+      sha512 = "8abe55c550aa5f185fa0919641749de22d807625d1ad84b561265653b17e04a267311b6d5be5d3e327af04f2ad5bc17352a2d48df7927c7183cf5578c9ebcdc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/nb-NO/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nb-NO/firefox-72.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "18df354679b1a564fe18367d12a0a739e2ff330f4c7b559e3c9e2ce9af842bc8ebf94b01bf190f85255927a95df3dbe70fdf4baaee9f273c4bab8737e960ce7c";
+      sha512 = "c15e35640a4b6672fce9263a15dfbb519474652ce2024d6627d3a853ae8017071ea62eea0cc3524ea5c099aa3eb0de34e51d6765e0dd507a58311db6b810de44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ne-NP/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ne-NP/firefox-72.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "a8e86ab99146c482366eaf8e59cf4ebcbfb9012a2591f925b9a4940f85747eb066a365f1f5994bdbb4005989a7a2281f5f3a33dbab518449d05a3b66589209b0";
+      sha512 = "d5b54a65c3b12d7090061e23ab3e0428c6e870b1dd7c6293d13011921b868db6dfd8ed9f4e0ffa33d2af7c5f53ae2ad50eaeea0a87b0a9af676d32f6563d1e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/nl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nl/firefox-72.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "58f2f70a6cf55c70a5ae7a280f834b0f5553950abefe8e54cd804d540ba9ec16dc7c5c998bdf07499790b202546c95c9b65d9d42bb826191c1ea7154498cd939";
+      sha512 = "3c7c0e1b45948125a01b3447e6bb4d1bf48e79c16477bdaef5145e67d154f101b299ec696d22588052a5d7e3e87b226418795c3aeef9991d226bbd344d7e8c7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/nn-NO/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nn-NO/firefox-72.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "7a350a2415aabf4407fac3b26abbeda0cda67bc109636ebe06a1bcf6f449f24ac1676241f4e94359d466b130334f1894a4c962acb6fd531540c1b671ab0754c8";
+      sha512 = "f4391136225aa0e477c748d541e94be9b75b955ef8a756d12ac3213a7a83f0b273d320b512bd3cd82393f6fd1b1470f02206cb37562554179d0c23b3b6ab83cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/oc/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/oc/firefox-72.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "dec9c3c3e9c8a5502a4fcd3538248eceb827df95b7cd647e1ce562a3b8ad56e9b060e9fddbda68b87157ac04bac155ddb273b94146941f4adc814c77b07de322";
+      sha512 = "af5c368c519a95d575ca0cd3b719406ece8823350c828fb4984b58584c1abe8b743ee99bbbd29f98a543510c91358a80817d707070c2b2e341529e33ea955e64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/pa-IN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pa-IN/firefox-72.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c53fbe696a907608b557b071f8d10db9029fc315a6b4909a4387b056cd794efe3aae51f4ccba03235d90161284281f0feb3fbf7bd91f6c4b794786b2e632c3a7";
+      sha512 = "9e1f51321f34b9d4ae207b2630c7be558f16b0d1e3a0b7fcde82c908dc435b044388a3a23da99e28c7be3889275d67041cd53276b8a4af04f7b01e00f06ae3b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/pl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pl/firefox-72.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ebd0b078f7b6949d60dcc4d42e7b13a385528076bddfe75b659b7407fd9699cf705465a6bb37fe60bf9999a2d5a5f95b65580f77116423276434c47ab0e5651e";
+      sha512 = "3b5ec2695ceb35dd2b0d70b3f47cad9b692eb11447ed9bbf4b3fa8e049a35911802ee455a132fa812eaded78ef18df31ef3a8a11c8c95b260bc89350a7355181";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/pt-BR/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-BR/firefox-72.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "a08009bcca93ff1339d22d3c745153232b65332fba7546df17d761e7c382b4fff8bcde481b368a9704cda8096f42d39d5a422a1a6c3888fab2905c3df717338a";
+      sha512 = "df5fbe1a058233864e7ffae44538b14540ed4846ca5bdbfbf07eb627a8753c3bdaf68b337eb6e69900df8cf3930a9468e7c626583af60761854a282fd5d52b95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/pt-PT/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-PT/firefox-72.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ed90835cacda14da02f70ce7a8ddddb63df2c9c5952d5380b78da9c57d7f9264e6034fb6411c1da7d41d1f7c42107fcd3ce09530dcb63462849df194158ab7a2";
+      sha512 = "0145016eb55586388a49fe052daf5d7cadadda15ae88ccbf1410f35de0d0e4fbcf7afa5ab5889c9c88a0937691617a51ac53dc8db070aa199b17840275d03ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/rm/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/rm/firefox-72.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "b67fbd54ef325232ef4c3168aeb1511bd96a3b359d71f4edfd2dc3f925d9d246192c24c65332baa80d57f3449dc94f6c3f06fb9ffd6204959ec7745e61cdfd6c";
+      sha512 = "9890545266e1f31a27c50a4782acb6d3af0825699e6ec78151d872d7a181c6258a08764cbf046d483593bfd8467c4c78b9bc316fef20bf444afa73b7bcc14795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ro/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ro/firefox-72.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "deffedac6577d0e413954217b075cb775330b11013076d484329710756fd539ba2c35af8c267f49aa367e7d61cf56de65d67b2c888db58401012f8c3f6113427";
+      sha512 = "e13b760d6d61079136b4449ee14a8d2cbaf72512071f4475d8fdb95337ef86970ee3eb72f987c1e07290650898108f0e90948ecb2ae027ba40b5fdd53ff7303e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ru/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ru/firefox-72.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "ded41bb7b3a0dadbaeb05b836a175988133a6e94637063efd63e7658a7887e38e2601384b79ac64be0b9de4100f923bf9de40c31562b9c4314ff0df7768be511";
+      sha512 = "3c51eb7be0e7a23b2f3ee8b8ec5cd420ceda5bcc3aad6b76ff4406ea0b59fd77327b295d78df6990556cc9c6f8d221978d6af58890d4122cfb604891fe6d574d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/si/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/si/firefox-72.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c45238b95c815603e01c180eaf254e06a7e2feddf429adc58977fa5cd5b094774f6c0e9f34030dfc38fa198662cf0ae5289a78930b6f37042b2c1bba4109a37d";
+      sha512 = "1a4bb6b01a0d9bc89b270844d4c1e235354abc447068b45b3630733d1735b66e65c808f70c532474c31298b7962b463c7b71bda89ae2f302fcb847101e0734b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/sk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sk/firefox-72.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "5a2cbbf81ac7b879413ac0813890d37609ce7c9fbf47037e20886d9728fd4687159a193fed05c15090c8a47d43e63059925c901020c1661db1f979f62c8a385e";
+      sha512 = "c46e2914e4afdd9b3e6a0eec1f2e5ff9082944221a35d9a4de8439f5c31ee705b37575eebad365e19ad2a447eea065a712cb02150757cf053be83986e69700c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/sl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sl/firefox-72.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "6c47debf86017544d54494eb7a17823bb2de08e1c8fd5d0065e2887349c19eb1c83a617b2f828ac547629d32d6ea0f8b6b7cec616f80cdf56120e2008b180764";
+      sha512 = "335256ef9a8c9008119fc7de2f14c4c51e288f65cfeac0ce8dea737cab04772739f99401ef7b8873e95e0290239502a227d3a6772d7fab96ae7e78437b6854a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/son/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/son/firefox-72.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7f3068c3d69972e730a7141e098c658773b10bb462168eddcd3adcf9b4874229b571cc8f7eed99ed6b45be8b74c79219d0cd12fa43797603ab2f032557fe8f8f";
+      sha512 = "1de8c05e776163d5015487ee1c48b63f8c2beb6699c3502e9bd08058529a59324df59f26426852558e30018657978ea613b97e2e651a6dc500379d4a61651947";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/sq/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sq/firefox-72.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "4db0d7f87447910fa43e4145cf024c5a165a10b9809bc18c4b76f2a86cb41aeeae3193d34f4bdcc7bead8a62974fd68f8883ace5c79d35e33a47c954d73eea1f";
+      sha512 = "02794e37e26dbc6b8df8a62d9a29a5e47cf0a45a1929265c1177c97181592a5ecaa99b5549bb95da00a0559d1488723a4454866d2e5edb08413b984165150140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/sr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sr/firefox-72.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "85d8ecf97a1b1f7eff30b1de4bb84ed0637bf99cb72ad444e7e769d29cd687773e66dbed2116f5997af6fbf64802ab7c31b28f579e7a517a08a6cf06f92c8f96";
+      sha512 = "dbe5862115a4f55f2c78de57b03198e08dce35d491b60238955d406b0696600bec8f116615a41bac3d80d5e77e1faccdc33663056b4b15aad952d0b096d73260";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/sv-SE/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sv-SE/firefox-72.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "322f999692fbf3931789b3b6af5eb646545f5e9fe4876ba004b3803454d89c633fe0ba85283954edd3fe4439ab30e17eeb4e4edd655570e07da2c0c78bda0e22";
+      sha512 = "4c0d9dea8339def7a3dc300da9f8cfa1ba6d6eb5a5899918bf0ab8211b4b5aab4367ca91a7a290aa5faa3424588d29bc34e89ab645bca155d8ce6150e225b946";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ta/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ta/firefox-72.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ba1c8227da1f99f385376402133ac2706bf20fef739ff48850daf1f0e586b87146322ac18af838eb32355ae40288f922ebd5a1976039a800de60077b4428dc44";
+      sha512 = "d70089c118868484a556e747a72cab6242ca7a5aedd7425c59f273170ec559afd9b057d7106226a9948540641d25829b21b4bb9b4bf15b02f3ec2702badac873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/te/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/te/firefox-72.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "1d785d24d460e536f35a88fa0d8feb6434f1ccadb38e89946f8e432a2d98161cf10bf42c6d34fde577d5d2c4b13d47fab43abfa2f18554231a53887e361d6ad8";
+      sha512 = "bb65f50f55d11b79c1943df102b6f3479127c89c74bf4cc7aeb5fa8dea61116f23caef84a770016567285cbd7788c923f3c87af5598d7ffb805c541e0c69a0fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/th/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/th/firefox-72.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ef10ce89127be75a918e9825ceb97aaf7e2f66ca0591ebba624fa2da786a267304b1e505a1dca72282a92d6c6678148c6cc322e02175c1f506bed110ee7936fe";
+      sha512 = "5dc7eb602e0ab548d5f337bd79630c516968544bcf6f801093676f784f54e20b5218d2fd0b323cff31292aca15616e2485e75c3475f71c2681222bc10a74e367";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/tl/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tl/firefox-72.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "ed033872bfc0a06b0928e5bc775e4f4dda5267555d086c7719872491480dd6e70bd94540aa9dc0a197d907ff66642b93460e41c04f721f7d0daed663bfc1d091";
+      sha512 = "3318940aafc8af7421a2e1973a1bdfabb6670dda5a104de41f4ed1abbb3c904e6319ceb6f94fddcf11e4d18e5f72d439f5e4506f6b42f9b5adddbf291e9e2532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/tr/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tr/firefox-72.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "d4c24c049e4fd378e7c20d3df5dc2a9c5e9cdefe3f84e5dd6b3fefea10fb8010a01f96cbaf7635914c9bea38f0059d11c8f7e7ac748f4fa9d7f3351259301fd8";
+      sha512 = "fedcec77a95458fd334be9c8af587923d6281a50ed9c146a32f289f51138ab27d0cf551ccaae77fec2f5e4aa2565c12af7267d5476e777d95761ac2f6904cdcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/trs/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/trs/firefox-72.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "931a3b11e536164b6743a7005f3b826495616ce591c50fbe2ccb42d32908c88412d5a9519843eb7f4ad50e406b9fd14ea69295c313f30a3d41c3338638e483d4";
+      sha512 = "1f4293cf978b92114b25aecf7f633608eb0ec52274147b939bda57463bfa170467484d3eac34183588b58ebcab6c68b20d59561961489069b7fdb120474806ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/uk/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uk/firefox-72.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6baa572a479043e15de3704f009ca3702ef48d18f364401165a20367809fc4f09b59d04734bd9ffb698d1e834dd88540abe4f951354650c731304b6cc1333018";
+      sha512 = "7e7b442ed847d07ee42c9665835a6fbb06f1b8e61e04dccbe623624facc0fb4ed3832b91192819190be785decaf07a61575f198f089f852b814328a168e2af5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/ur/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ur/firefox-72.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "9eb660140868950613b2754b006e5f7bc08f73830be2508fc6a39a83dce9509796b834dcce0288ffd74e8373f2c8a175f0034582d2aed769ead063bb57045d85";
+      sha512 = "4519a75106a92aa6b6c172fe565818f554aa9da3a6cad86fa6fc4ead9f3fec24bf5065f69e12d985b7798b7d0b019033b88b81605d9599746bbd58786d2d2025";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/uz/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uz/firefox-72.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9272971df4ffa5d1867b40b1f2d6004a64e604312208f3031edae6ddaf9a2dda262dca69aa5c41b9439241133a6fe64d43e5932192d3cc74a893290cb1594a45";
+      sha512 = "41f4eb9cb1f002373ab5d1587c92f6b3fc5b0729117dfe4d74e399d1c8b08c595fdf8d22a253296f4f838dae1f8c4eb15fb634a77a2d60f8d4d61fb402b2a1cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/vi/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/vi/firefox-72.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "ebf8065c61505a8daaba054711a523abb6053db6560d8f72d0b7ca816784aa9ab5856b959357afe94fddc9e1d8e5140ca1bed4aae85daa8be71347e1f158e35b";
+      sha512 = "02a6856c5a9a13820cd26333d6968159743907304e58fa1973592f694968d3b9ab229811f239a0f5c37974ef16c504c71d2312127293b8276c7077b03dcbe0b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xh/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xh/firefox-72.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "e7121225f6eff3a16bfc95b38d07ef474b03891ce1b5a57905b5f521fecd8e8f5cac71b9246c65399f1bc4879279d4f53675db652c563d6023f0574a8dd30462";
+      sha512 = "d0076f85cd30481b7d174fe89b245c13063b6bf64465c0a6cd288ece96c662d77e25ff2412afe334310375dc3ea39bdfa31c81b1b67ca5d54f09d2e871e7d23b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/zh-CN/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-CN/firefox-72.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "8730552f819342a634e9eeae8e0989e54d9d4a3f0cdc76d5c296e6ed5f5028b5029286eccf4f252addd53e3e3e06a3321491d7b37b0d565b0524382210a02e0c";
+      sha512 = "d560bab6c8deef31fe2f582faa1cf827eac11e60b2ce8695be5c8682972247bd9b6abc3b7c0e2ec174e3dec09374c3a909554660b449abeea821c9b69fdc3550";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/zh-TW/firefox-72.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-TW/firefox-72.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ae10d531f4819cf603adcba33c5a5779bdf70962a4b0d802c1b001ae4c34b573941dcadd9b1ba6377d5b1dd55627bbb7f97b28d44c21c2cd9b124f1e465186d6";
+      sha512 = "06c70f2d07a84f98c5fc2407e29a53fdf08174c661908f788ef7b4b652a0c589c192c0eb6d5eb51e2b4fd6d529d491899c93e153cfd1e58169f3eb037d112dfc";
     }
     ];
 }

From 57aed520d8b0461da5369c9f3283529e576ba0d4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 21 Jan 2020 19:59:34 +0900
Subject: [PATCH 325/755] firefox: 72.0.1 -> 72.0.2

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 54be5fd32b6e..3cd72fec7cd1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -16,10 +16,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "72.0.1";
+    ffversion = "72.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "37ryimi6yfpcha4c9mcv8gjk38kia1lr5xrj2lglwsr1jai7qxrcd8ljcry8bg87qfwwb9fa13prmn78f5pzpxr7jf8gnsbvr6adxld";
+      sha512 = "13l23p2dqsf2cpdzaydqqq4kbxlc5jxggz9r2i49avn4q9bqx036zvsq512q1hk37bz2bwq8zdr0530s44zickinls150xq14kq732d";
     };
 
     patches = [

From 249e3d0ef381945d94ecd69368bb7c333ea084e2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 21 Jan 2020 20:03:26 +0900
Subject: [PATCH 326/755] firefox-esr: 68.4.1esr -> 68.4.2esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3cd72fec7cd1..833b97ba86f1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -100,10 +100,10 @@ rec {
 
   firefox-esr-68 = common rec {
     pname = "firefox-esr";
-    ffversion = "68.4.1esr";
+    ffversion = "68.4.2esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "3nqchvyr95c9xvz23z0kcqqyx8lskw0lxa3rahiagc7b71pnrk8l40c7327q1wd4y5g16lix0fg04xiy6lqjfycjsrjlfr2y6b51n4d";
+      sha512 = "1n7ssx4w5b822bq8zcv6vsy5ph1xjyj9qh6zbnknym5bc0spzk19nrkrpl8a2m26z6xj2lgw1n19gjf4ab6jpfxv3cqq4qwmm0v2fz1";
     };
 
     patches = [

From f52c3846ffdf92a603613f506571632483f8c509 Mon Sep 17 00:00:00 2001
From: wedens <wedens@eldis.ru>
Date: Tue, 21 Jan 2020 18:36:09 +0700
Subject: [PATCH 327/755] megacmd: init at 1.1.0

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

diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix
new file mode 100644
index 000000000000..9fe810e41477
--- /dev/null
+++ b/pkgs/applications/misc/megacmd/default.nix
@@ -0,0 +1,88 @@
+{ stdenv
+, autoconf
+, automake
+, c-ares
+, cryptopp
+, curl
+, fetchFromGitHub
+, ffmpeg
+, freeimage
+, gcc-unwrapped
+, libmediainfo
+, libraw
+, libsodium
+, libtool
+, libuv
+, libzen
+, pcre-cpp
+, pkgconfig
+, readline
+, sqlite
+}:
+
+stdenv.mkDerivation rec {
+  pname = "megacmd";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "meganz";
+    repo = "MEGAcmd";
+    rev = "${version}_Linux";
+    sha256 = "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkgconfig
+  ];
+
+  buildInputs = [
+    c-ares
+    cryptopp
+    curl
+    ffmpeg
+    freeimage
+    gcc-unwrapped
+    libmediainfo
+    libraw
+    libsodium
+    libtool
+    libuv
+    libzen
+    pcre-cpp
+    readline
+    sqlite
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [
+    "--disable-curl-checks"
+    "--disable-examples"
+    "--with-cares"
+    "--with-cryptopp"
+    "--with-curl"
+    "--with-ffmpeg"
+    "--with-freeimage"
+    "--with-libmediainfo"
+    "--with-libuv"
+    "--with-libzen"
+    "--with-pcre"
+    "--with-readline"
+    "--with-sodium"
+    "--with-termcap"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "MEGA Command Line Interactive and Scriptable Application";
+    homepage    = https://mega.nz/;
+    license     = licenses.unfree;
+    platforms   = [ "i686-linux" "x86_64-linux" ];
+    maintainers = [ maintainers.wedens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82317127dacb..3ef680db1d97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1928,6 +1928,8 @@ in
 
   megasync = libsForQt5.callPackage ../applications/misc/megasync { };
 
+  megacmd = callPackage ../applications/misc/megacmd { };
+
   meritous = callPackage ../games/meritous { };
 
   opendune = callPackage ../games/opendune { };

From 341097c8cf55dc0ccd178fc13866339546f6dd55 Mon Sep 17 00:00:00 2001
From: Pasquale <p3dimaria@hotmail.it>
Date: Tue, 21 Jan 2020 12:38:22 +0100
Subject: [PATCH 328/755] zsh-bd: init at 2018-07-04

---
 pkgs/shells/zsh/zsh-bd/default.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/shells/zsh/zsh-bd/default.nix

diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix
new file mode 100644
index 000000000000..b5b66af6ca38
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-bd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub}:
+
+stdenv.mkDerivation rec {
+  pname = "zsh-bd";
+  version = "2018-07-04";
+
+  src = fetchFromGitHub {
+    owner = "Tarrasch";
+    repo = pname;
+    rev = "d4a55e661b4c9ef6ae4568c6abeff48bdf1b1af7";
+    sha256 = "020f8nq86g96cps64hwrskppbh2dapfw2m9np1qbs5pgh16z4fcb";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/zsh-bd
+    cp {.,$out/share/zsh-bd}/bd.zsh
+    cd $out/share/zsh-bd
+    ln -s bd{,.plugin}.zsh
+  '';
+
+  meta = {
+    description = "Jump back to a specific directory, without doing `cd ../../..` ";
+    homepage = "https://github.com/Tarrasch/zsh-bd";
+    license = stdenv.lib.licenses.free;
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.olejorgenb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf9c11c56154..09272b44c503 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7031,6 +7031,8 @@ in
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
+  
+  zsh-bd = callPackage ../shells/zsh/zsh-bd { };
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
 

From b54c60b68951bd137d6a581da0000121b9e7d121 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 20 May 2019 14:06:12 +0200
Subject: [PATCH 329/755] nixos/zerotierone: simplify the unit

There is no need to stop/start the unit when the machine is online or
offline.

This should fix the shutdown locking issues.

nixos zerotier: sometimes it doesn't shutdown
---
 nixos/modules/services/networking/zerotierone.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 764af3846fe5..069e15a909b7 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -38,10 +38,13 @@ in
   config = mkIf cfg.enable {
     systemd.services.zerotierone = {
       description = "ZeroTierOne";
-      path = [ cfg.package ];
-      bindsTo = [ "network-online.target" ];
-      after = [ "network-online.target" ];
+
       wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      wants = [ "network-online.target" ];
+
+      path = [ cfg.package ];
+
       preStart = ''
         mkdir -p /var/lib/zerotier-one/networks.d
         chmod 700 /var/lib/zerotier-one
@@ -53,6 +56,7 @@ in
         ExecStart = "${cfg.package}/bin/zerotier-one -p${toString cfg.port}";
         Restart = "always";
         KillMode = "process";
+        TimeoutStopSec = 5;
       };
     };
 

From f8df74be4b4be4e9ddff6292c6600983357fbd54 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 10 Jan 2020 21:02:44 +0100
Subject: [PATCH 330/755] vncdo: fix build

---
 pkgs/tools/admin/vncdo/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
index a126a430e52c..3dd7a45aa2b7 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
-, pythonPackages
+, python2Packages
 }:
-pythonPackages.buildPythonPackage {
+python2Packages.buildPythonPackage {
   pname = "vncdo";
   version = "0.11.2";
 
@@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage {
     sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     pillow
     twisted
     pexpect
@@ -20,6 +20,8 @@ pythonPackages.buildPythonPackage {
     ptyprocess
   ];
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/sibson/vncdotool;
     description = "A command line VNC client and python library";

From 93204f1d8a95ed7b340ae9ad33fec86367100a79 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 10 Jan 2020 21:00:43 +0100
Subject: [PATCH 331/755] nixos/matterbridge: fix package access

was broken by 4371ecb8a61f672b3bbf82fca32efbb418a3730f due to the
switch to buildGoModule
---
 nixos/modules/services/networking/matterbridge.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
index bad35133459a..b8b4f37c84a8 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -111,7 +111,7 @@ in
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
+        ExecStart = "${pkgs.matterbridge}/bin/matterbridge -conf ${matterbridgeConfToml}";
         Restart = "always";
         RestartSec = "10";
       };

From ab10bac1b177832b5e6b883ba95bf35f87229267 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 13 Nov 2019 15:56:49 +0000
Subject: [PATCH 332/755] nixos-rebuild: fix the maybeSudo usage

* properly expand the command using arrays instead of strings
* also handle sudo on the localhost
---
 nixos/modules/installer/tools/nixos-rebuild.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index c53dc1000c4a..61b4af110273 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -22,7 +22,7 @@ repair=
 profile=/nix/var/nix/profiles/system
 buildHost=
 targetHost=
-maybeSudo=
+maybeSudo=()
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -92,7 +92,7 @@ while [ "$#" -gt 0 ]; do
         ;;
       --use-remote-sudo)
         # note the trailing space
-        maybeSudo="sudo "
+        maybeSudo=(sudo --)
         shift 1
         ;;
       *)
@@ -102,6 +102,10 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
+if [ -n "$SUDO_USER" ]; then
+    maybeSudo=(sudo --)
+fi
+
 if [ -z "$buildHost" -a -n "$targetHost" ]; then
     buildHost="$targetHost"
 fi
@@ -116,17 +120,17 @@ buildHostCmd() {
     if [ -z "$buildHost" ]; then
         "$@"
     elif [ -n "$remoteNix" ]; then
-        ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$maybeSudo$@"
+        ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "${maybeSudo[@]}" "$@"
     else
-        ssh $SSHOPTS "$buildHost" "$maybeSudo$@"
+        ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@"
     fi
 }
 
 targetHostCmd() {
     if [ -z "$targetHost" ]; then
-        "$@"
+        "${maybeSudo[@]}" "$@"
     else
-        ssh $SSHOPTS "$targetHost" "$maybeSudo$@"
+        ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@"
     fi
 }
 

From 1c45292ea39770f83ede7bad03d680ef4a1e244b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Jan 2020 07:25:00 -0500
Subject: [PATCH 333/755] jetbrains-mono: 1.0.0 -> 1.0.1

Changelog: https://github.com/JetBrains/JetBrainsMono/releases/tag/1.0.1
---
 pkgs/data/fonts/jetbrains-mono/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index 05eb554c6f49..ada7f23f4211 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,18 +1,20 @@
 { lib, fetchzip }:
 
 let
-  version = "1.0.0";
+  version = "1.0.1";
 in
 fetchzip rec {
   name = "JetBrainsMono-${version}";
 
-  url = "https://download.jetbrains.com/fonts/JetBrainsMono-${version}.zip";
+  url = "https://github.com/JetBrains/JetBrainsMono/releases/download/${version}/JetBrainsMono-${version}.zip";
 
-  sha256 = "0mwqi66d56v4ml1w7wjsiidrh153jvh0czafyic47rkvmxhnrrhv";
+  sha256 = "15a8fwyg8ns6krq6nsvgn41iaqbd3lgm3cmv7w370gr6brbn6lxq";
 
   postFetch = ''
     unzip $downloadedFile
-    install -m444 -Dt $out/share/fonts/truetype *.ttf
+    install -m444 -Dt $out/share/fonts/truetype ttf/*.ttf
+    install -m444 -Dt $out/share/fonts/woff/ web/woff/*.woff
+    install -m444 -Dt $out/share/fonts/woff2/ web/woff2/*.woff2
   '';
 
   meta = with lib; {

From 099a5aecd39d06474f4d58e5c61f6701b69283ae Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 21 Jan 2020 13:32:58 +0100
Subject: [PATCH 334/755] vertcoin: init at 0.14.0

---
 pkgs/applications/blockchains/vertcoin.nix | 69 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 +
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/blockchains/vertcoin.nix

diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix
new file mode 100644
index 000000000000..1b8b0376331a
--- /dev/null
+++ b/pkgs/applications/blockchains/vertcoin.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, fetchFromGitHub
+, openssl
+, boost
+, libevent
+, autoreconfHook
+, db4
+, pkgconfig
+, protobuf
+, hexdump
+, zeromq
+, withGui
+, qtbase ? null
+, qttools ? null
+, wrapQtAppsHook ? null
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  pname = "vertcoin";
+  version = "0.14.0";
+
+  name = pname + toString (optional (!withGui) "d") + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = pname + "-project";
+    repo = pname + "-core";
+    rev = version;
+    sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    hexdump
+  ] ++ optionals withGui [
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    openssl
+    boost
+    libevent
+    db4
+    zeromq
+  ] ++ optionals withGui [
+    qtbase
+    qttools
+    protobuf
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+      "--with-boost-libdir=${boost.out}/lib"
+  ] ++ optionals withGui [
+      "--with-gui=qt5"
+      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
+
+  meta = {
+    description = "A digital currency with mining decentralisation and ASIC resistance as a key focus";
+    homepage = "https://vertcoin.org/";
+    license = licenses.mit;
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82317127dacb..8669439f8251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22692,6 +22692,9 @@ in
 
   sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
 
+  vertcoin  = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; };
+  vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; };
+
   wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
 
   wownero = callPackage ../applications/blockchains/wownero.nix {};

From d43fb5a39d9a70d2aa9c75b1adcb184ffe4990e9 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 21 Jan 2020 12:00:40 +0100
Subject: [PATCH 335/755] digibyte: init at 7.17.2

---
 pkgs/applications/blockchains/digibyte.nix | 69 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 +
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/blockchains/digibyte.nix

diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte.nix
new file mode 100644
index 000000000000..0d0fc081a118
--- /dev/null
+++ b/pkgs/applications/blockchains/digibyte.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, fetchFromGitHub
+, openssl
+, boost
+, libevent
+, autoreconfHook
+, db4
+, pkgconfig
+, protobuf
+, hexdump
+, zeromq
+, withGui
+, qtbase ? null
+, qttools ? null
+, wrapQtAppsHook ? null
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  pname = "digibyte";
+  version = "7.17.2";
+
+  name = pname + toString (optional (!withGui) "d") + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04czj7mx3wpbx4832npk686p9pg5zb6qwlcvnmvqf31hm5qylbxj";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    hexdump
+  ] ++ optionals withGui [
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    openssl
+    boost
+    libevent
+    db4
+    zeromq
+  ] ++ optionals withGui [
+    qtbase
+    qttools
+    protobuf
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+      "--with-boost-libdir=${boost.out}/lib"
+  ] ++ optionals withGui [
+      "--with-gui=qt5"
+      "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+  ];
+
+  meta = {
+    description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain";
+    homepage = "https://digibyte.io/";
+    license = licenses.mit;
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee74eb17f311..b435ab8b258a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22641,6 +22641,9 @@ in
 
   dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; };
 
+  digibyte = libsForQt5.callPackage ../applications/blockchains/digibyte.nix { withGui = true; };
+  digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; };
+
   dogecoin  = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
 

From b1ab68cc1e770b43bbb516b86b1a0c135cb577e7 Mon Sep 17 00:00:00 2001
From: Dave Nicponski <dave.nicponski@gmail.com>
Date: Tue, 21 Jan 2020 07:36:39 -0500
Subject: [PATCH 336/755] unison-ucm 1.0.g-alpha -> 1.0.h-alpha

Update binary derivation for latest release.
---
 pkgs/development/compilers/unison/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 2a8c07fa0fe0..c24786cd9a04 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
 
 stdenv.mkDerivation rec {
   pname = "unison-code-manager";
-  milestone_id = "M1g";
+  milestone_id = "M1h";
   version = "1.0.${milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
-      sha256 = "186y7y7ffg976w01cbb8am84ajbifb7lcnsc4g3x262mkswr7lry";
+      sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp";
     }
   else
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
-      sha256 = "1ki9car1clpaspnl5jb5qnr6nzv108q279n8m8bjm8azfcnl61ab";
+      sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci";
     };
 
   # The tarball is just the prebuilt binary, in the archive root.

From 1102fc870d46fdf9a96c6f2e2a0cbdc8156f05e8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 21 Jan 2020 14:00:54 +0100
Subject: [PATCH 337/755] pythonPackages.django_2_1: drop

Django-2.1 support ended on December 2, 2019, so drop it in nixpkgs as
well.
---
 .../applications/office/paperless/default.nix |  2 +-
 .../development/python-modules/django/2_1.nix | 38 -------------------
 pkgs/top-level/python-packages.nix            |  4 --
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django/2_1.nix

diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
index 97088f360417..1383986cf2ed 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@@ -116,7 +116,7 @@ let
     };
   };
 
-  django_2_0 = pyPkgs: pyPkgs.django_2_1.overrideDerivation (_: rec {
+  django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec {
     pname = "Django";
     version = "2.0.12";
     name = "${pname}-${version}";
diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
deleted file mode 100644
index 19e8b0c1a751..000000000000
--- a/pkgs/development/python-modules/django/2_1.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll,
-  isPy3k,
-  geos, gdal, pytz,
-  withGdal ? false
-}:
-
-buildPythonPackage rec {
-  pname = "Django";
-  version = "2.1.15";
-
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c";
-  };
-
-  patches = stdenv.lib.optionals withGdal [
-    (substituteAll {
-      src = ./1.10-gis-libs.template.patch;
-      geos = geos;
-      gdal = gdal;
-      extension = stdenv.hostPlatform.extensions.sharedLibrary;
-    })
-  ];
-
-  propagatedBuildInputs = [ pytz ];
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A high-level Python Web framework";
-    homepage = https://www.djangoproject.com/;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ georgewhewell ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 098d3b19eee1..8a5c4a18f368 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3187,10 +3187,6 @@ in {
     gdal = self.gdal;
   };
 
-  django_2_1 = callPackage ../development/python-modules/django/2_1.nix {
-    gdal = self.gdal;
-  };
-
   django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
 
   django_1_8 = callPackage ../development/python-modules/django/1_8.nix { };

From 0daae2e08c1b5c0d4141f6655d38bac7b70569e7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 21 Jan 2020 14:21:57 +0100
Subject: [PATCH 338/755] nixos/buildkite: drop user option (#78160)

* nixos/buildkite: drop user option

This reverts 8c6b1c3eaaa8b555bddaced3ab6f02695bef1541.

Turns out, buildkite-agent has logic to write .ssh/known_hosts files and
only really works when $HOME and the user homedir are in sync.

On top of that, we provision ssh keys in /var/lib/buildkite-agent, which
doesn't work if that other users' homedir points elsewhere (we can cheat
by setting $HOME, but then getent and $HOME provide conflicting
results).

So after all, it's better to only run the system-wide buildkite agent as
the "buildkite-agent" user only - if one wants to run buildkite as
different users, systemd user services might be a better fit.

* nixosTests.buildkite-agent: add node with separate user and no ssh key
---
 .../buildkite-agent.nix                       | 15 ++---------
 nixos/tests/buildkite-agent.nix               | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 418a7bc1a468..58bce6549414 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -29,8 +29,6 @@ let
     ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))}
   '';
 
-  defaultUser = "buildkite-agent";
-
 in
 
 {
@@ -58,15 +56,6 @@ in
         type = types.listOf types.package;
       };
 
-      user = mkOption {
-        type = types.str;
-        default = defaultUser;
-        description = ''
-          Set this option when you want to run the buildkite agent as something else
-          than the default user "buildkite-agent".
-        '';
-      };
-
       tokenPath = mkOption {
         type = types.path;
         description = ''
@@ -197,7 +186,7 @@ in
   };
 
   config = mkIf config.services.buildkite-agent.enable {
-    users.users.buildkite-agent = mkIf (cfg.user == defaultUser) {
+    users.users.buildkite-agent = {
       name = "buildkite-agent";
       home = cfg.dataDir;
       createHome = true;
@@ -242,7 +231,7 @@ in
 
         serviceConfig =
           { ExecStart = "${cfg.package}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
-            User = cfg.user;
+            User = "buildkite-agent";
             RestartSec = 5;
             Restart = "on-failure";
             TimeoutSec = 10;
diff --git a/nixos/tests/buildkite-agent.nix b/nixos/tests/buildkite-agent.nix
index 042ce389eb8a..3c824c9aedf5 100644
--- a/nixos/tests/buildkite-agent.nix
+++ b/nixos/tests/buildkite-agent.nix
@@ -6,18 +6,31 @@ import ./make-test-python.nix ({ pkgs, ... }:
     maintainers = [ flokli ];
   };
 
-  machine = { pkgs, ... }: {
-    services.buildkite-agent = {
-      enable = true;
-      privateSshKeyPath = (import ./ssh-keys.nix pkgs).snakeOilPrivateKey;
-      tokenPath = (pkgs.writeText "my-token" "5678");
+  nodes = {
+    node1 = { pkgs, ... }: {
+      services.buildkite-agent = {
+        enable = true;
+        privateSshKeyPath = (import ./ssh-keys.nix pkgs).snakeOilPrivateKey;
+        tokenPath = (pkgs.writeText "my-token" "5678");
+      };
+    };
+    # don't configure ssh key, run as a separate user
+    node2 = { pkgs, ...}: {
+      services.buildkite-agent = {
+        enable = true;
+        tokenPath = (pkgs.writeText "my-token" "1234");
+      };
     };
   };
 
   testScript = ''
+    start_all()
     # we can't wait on the unit to start up, as we obviously can't connect to buildkite,
     # but we can look whether files are set up correctly
-    machine.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg")
-    machine.wait_for_file("/var/lib/buildkite-agent/.ssh/id_rsa")
+
+    node1.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg")
+    node1.wait_for_file("/var/lib/buildkite-agent/.ssh/id_rsa")
+
+    node2.wait_for_file("/var/lib/buildkite-agent/buildkite-agent.cfg")
   '';
 })

From 39ee33c8328f6d78b90669c1cff6d6cbb0442a32 Mon Sep 17 00:00:00 2001
From: Serval <servalcat@pm.me>
Date: Tue, 21 Jan 2020 21:51:44 +0800
Subject: [PATCH 339/755] v2ray: 4.22.0 -> 4.22.1

---
 pkgs/tools/networking/v2ray/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index ee3ca416aa4a..5d1cd4540d7f 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,20 +3,20 @@
 , ... } @ args:
 
 callPackage ./generic.nix (rec {
-  version = "4.22.0";
+  version = "4.22.1";
 
   src = fetchFromGitHub {
     owner = "v2ray";
     repo = "v2ray-core";
     rev = "v${version}";
-    sha256 = "1gr4s96ii4dx5bcwpb82rn250pcnncxwzx147p9dbwbyiy0i9nz7";
+    sha256 = "0l4rg9galjcm6dzv7sapnim9a02z7pv354mk5mwqndznii6nkr73";
   };
 
   assets = {
     # MIT licensed
     "geoip.dat" = let
-      geoipRev = "202001010102";
-      geoipSha256 = "16i73c3852f7zmya0q3856cc4gvhqhpln9s98qvr2dr1mpp72c1w";
+      geoipRev = "202001210102";
+      geoipSha256 = "1wxhrhrigjqzpy5w8yj7yd9ib245xwhqys2pf9prdknq71piyziz";
     in fetchurl {
       url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
       sha256 = geoipSha256;
@@ -24,8 +24,8 @@ callPackage ./generic.nix (rec {
 
     # MIT licensed
     "geosite.dat" = let
-      geositeRev = "20191226.1";
-      geositeSha256 = "0b4ji5kj5jpkwri3libxm9yl49dcy91vkl7h1rkhrrhbl17s3qiy";
+      geositeRev = "202001211332";
+      geositeSha256 = "06qlbjxk21lhyh5l3pd8l4m9rdl7sjh2jriz51zihaqx4417f0m7";
     in fetchurl {
       url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
       sha256 = geositeSha256;

From f0da790b6dc505eacd2f43bb677a3464a6b15b28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 14:13:32 +0000
Subject: [PATCH 340/755] glusterfs: 7.1 -> 7.2

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index b5fc12024b17..db5c469e63b6 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "7.1";
+    version = "7.2";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "11v5hwijbb08xq3dd4m6bkspa3v4vjzcnw6j1qyh0gjmc7yy4ml3";
+    sha256 = "0v333q217rvgh6bnmq4bcafkjz2gq0p4xqmxd3carkyl1zyyp8q5";
   };
 
   buildInputs = [

From c2a7cfb3a8f629009105526a5a3d94a5d66cd505 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:05:56 +0000
Subject: [PATCH 341/755] gnome3.gnome-boxes: 3.34.2 -> 3.34.3

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index d59746adc3d9..1fecf80e9ae9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -51,11 +51,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "3.34.2";
+  version = "3.34.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1rqdjf61cbi3zcpzr6cfkj3lcfrdlhs20bl65lxw2xrwk4jn0ph5";
+    sha256 = "1izhqgsb658lzrzj12dw06w47bjhqdpfl0j74aq7bzql7nqsb3wa";
   };
 
   doCheck = true;

From 3d302c3fb0f3c1acf50c5a237138667f838e17aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:09:40 +0000
Subject: [PATCH 342/755] groonga: 9.1.0 -> 9.1.1

---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index cfadeac5f076..d610a02ee919 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "groonga";
-  version = "9.1.0";
+  version = "9.1.1";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
-    sha256 = "11mlpnaldb6z438qdb7qjq9dxbh71l6v6lrv69fxka34izpgyhkk";
+    sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82";
   };
 
   buildInputs = with stdenv.lib;

From 6d0b9e25c2c30866c89cb1b6edbc6eac39ad5189 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:27:56 +0000
Subject: [PATCH 343/755] guitarix: 0.38.1 -> 0.39.0

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 91f4b1dcdfe9..ca552882ba43 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "guitarix";
-  version = "0.38.1";
+  version = "0.39.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "0bw7xnrx062nwb1bfj9x660h7069ncmz77szcs8icpqxrvhs7z80";
+    sha256 = "1nn80m1qagfhvv69za60f0w6ck87vmk77qmqarj7fbr8avwg63s9";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ];

From 1dfb57fb58b860d11df3383ff2e370a827fdd249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 21 Jan 2020 12:29:50 -0300
Subject: [PATCH 344/755] libieee1284: init at 0.2.11

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

diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix
new file mode 100644
index 000000000000..b5708a83a7d3
--- /dev/null
+++ b/pkgs/development/libraries/libieee1284/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  pname = "libieee1284";
+  version = "0.2.11";
+
+  src = fetchFromGitHub {
+    owner = "twaugh";
+    repo = pname;
+    rev = "V${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    xmlto
+    docbook_xml_dtd_412
+    docbook_xsl
+  ];
+
+  configureFlags = [
+    "--without-python"
+  ];
+
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Parallel port communication library";
+    homepage = "http://cyberelk.net/tim/software/libieee1284/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82317127dacb..c23c7dbb6270 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12608,6 +12608,8 @@ in
 
   libicns = callPackage ../development/libraries/libicns { };
 
+  libieee1284 = callPackage ../development/libraries/libieee1284 { };
+
   libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
 
   libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };

From 48ba125302d13d3b25e7e6f247743600ab12917b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:34:14 +0000
Subject: [PATCH 345/755] groovy: 2.5.8 -> 2.5.9

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index bdd138418969..67d9ecf9c61f 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "groovy";
-  version = "2.5.8";
+  version = "2.5.9";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "0hl7m9fpmrn9ppxbb3pm68048xpzig7q6hqyg121gvcziywi9ys9";
+    sha256 = "16xq8mz7270kmiq4xb0g52y7ik1bbl2nb8aaz9zw8a9h38rdr9zy";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 17eb447f4265eec712e3c03bd9f73583f4fdc0a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:39:59 +0000
Subject: [PATCH 346/755] fplll: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index f53d55c2ca94..107635267c6f 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fplll";
-  version = "5.3.1";
+  version = "5.3.2";
 
   src = fetchFromGitHub {
     owner = "fplll";
     repo = "fplll";
     rev = version;
-    sha256 = "1bzlqavbch5smra75znh4ljr490wyx5v6hax8r9rjbgk605i33ns";
+    sha256 = "00iyz218ywspizjiimrjdcqvdqmrsb2367zyy3vkmypnf9i9l680";
   };
 
   nativeBuildInputs = [

From ac6524dc7f3e535604a748f794c1626a4179d4e4 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 21 Jan 2020 10:42:06 -0500
Subject: [PATCH 347/755] cargo-about: init at 0.1.1

---
 .../cargo-about/default.nix                   | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-about/default.nix

diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
new file mode 100644
index 000000000000..2e1384693ec2
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -0,0 +1,22 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-about";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "EmbarkStudios";
+    repo = "cargo-about";
+    rev = "${version}";
+    sha256 = "1n9274np1ibz1s35q1qqajnwj7w4l695js9xdbga5wim18ly622m";
+  };
+
+  cargoSha256 = "0zjvvqw68y6zmjzmd22hh246422x2kxljj73vxywkl18crkakd7k";
+
+  meta = with lib; {
+    description = "Cargo plugin to generate list of all licenses for a crate";
+    homepage = "https://github.com/EmbarkStudios/cargo-about";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ evanjs ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82317127dacb..15851bde6dd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8780,6 +8780,7 @@ in
 
   defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
 
+  cargo-about = callPackage ../tools/package-management/cargo-about { };
   cargo-audit = callPackage ../tools/package-management/cargo-audit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From fd3c6042f32c1bef7096cc1fb09deec1456ab507 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:51:08 +0000
Subject: [PATCH 348/755] gcab: 1.3 -> 1.4

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

diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index c05bb95913e6..9946ebc05a54 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gcab";
-  version = "1.3";
+  version = "1.4";
 
   outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1rv81b37d5ya7xpfdxrfk173jjcwabxyng7vafgwyl5myv44qc0h";
+    sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7";
   };
 
   patches = [

From 41750ed20fd936483de9a90a89c394014af236dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 15:54:30 +0000
Subject: [PATCH 349/755] gnome3.four-in-a-row: 3.34.1 -> 3.34.3

---
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 5f6cb92cde24..078b5051c846 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.34.1";
+  version = "3.34.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "112pyrh2yvwy5b2a0b5crjpwp2vqqg4zgx6csll1bic6ccayv713";
+    sha256 = "1agdjg9kcfcfaq3d2w4s4ksci6is1jzfnxanp3f84zqdq55s0k1y";
   };
 
   nativeBuildInputs = [

From a38ff8120d3c8767e92099655d3a147f16eebde8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 02:43:49 +0000
Subject: [PATCH 350/755] assimp: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index b9207e517069..ca3320269827 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "assimp";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub{
     owner = "assimp";
     repo = "assimp";
     rev = "v${version}";
-    sha256 = "17y5q5hbygmb0cgf96gd3v8sal5g69cp8hmh1cs3yz7v00kjysmz";
+    sha256 = "00vxzfcrs856qnyk806wqr67nmpjk06mjby0fqmyhm6i1jj2hg1w";
   };
 
   buildInputs = [ cmake boost zlib ];

From a055d4d4a41f5cb1f7f0828ef3608c449c2d9fee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 08:05:05 -0800
Subject: [PATCH 351/755] gjs: 1.58.3 -> 1.58.4 (#78163)

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

diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 7facdc1426fe..dc2a7ed4859f 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.58.3";
+  version = "1.58.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya";
+    sha256 = "0pxxgsb9gvymgr7qsglfdbaa7hy29y01prszjr27f7bpdik3y6i6";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From bdb16451b95a06fb01466f5b7d26c428068d1993 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 08:08:32 -0800
Subject: [PATCH 352/755] gnome3.gnome-notes: 3.34.1 -> 3.34.2 (#78167)

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 434a72341f66..7137ec7180e3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -5,14 +5,14 @@
 , gnome3, libxml2, gsettings-desktop-schemas, tracker }:
 
 let
-  version = "3.34.1";
+  version = "3.34.2";
 in stdenv.mkDerivation {
   pname = "gnome-notes";
   inherit version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
-    sha256 = "0yf2scjnn2qi40g4iqg11qc4bnspd3qcnvg5b11ign5fa3qcihzv";
+    sha256 = "0kmhivgamnv2kk5kywrwm4af4s7663rjwh2wdri8iy1n2gmc9qpv";
   };
 
   doCheck = true;

From d0fcf24c61959135f44fd4c885b5081bf3ee450f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 08:09:46 -0800
Subject: [PATCH 353/755] gnome3.gnome-taquin: 3.34.2 -> 3.34.3 (#78171)

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

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 9edeb3ea5dec..00f138ee7626 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.34.2";
+  version = "3.34.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ff3h57wr26np3dlh7smpslba2awxasmhv3y45bn498i3n1vyvsk";
+    sha256 = "0njlcqb316qbi0dm2j39s42ca8gc2fqmk5aqill5gpb57znb4d81";
   };
 
   passthru = {

From dbc61de0051efaad8e986d5bc601fbacbb90619b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 16:51:30 +0000
Subject: [PATCH 354/755] hwinfo: 21.67 -> 21.68

---
 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 d323f048ba05..048af14efb15 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwinfo";
-  version = "21.67";
+  version = "21.68";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = version;
-    sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji";
+    sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg";
   };
 
   patchPhase = ''

From dea2f98262fbe65003fa1d15a64f79bede24d2f3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 21 Jan 2020 17:55:09 +0100
Subject: [PATCH 355/755] wireguard-tools: 1.0.20200102 -> 1.0.20200121

https://lists.zx2c4.com/pipermail/wireguard/2020-January/004869.html
---
 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 a01b0ab2061c..df2cdf6b5909 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "wireguard-tools";
-  version = "1.0.20200102";
+  version = "1.0.20200121";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
-    sha256 = "0ry3vbckcbkx43bz0bqinrd1hkll67jbwb72ak0b41wkxjsc8fmv";
+    sha256 = "0s82i8ibf0zj2wka625vh4rihdwmvlkv1v3bilrlcscwgfvzjfhf";
   };
 
   sourceRoot = "source/src";

From 5a8e936da8b9b2240d84ed661b23e542a66c9a8b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 21 Jan 2020 17:58:35 +0100
Subject: [PATCH 356/755] linuxPackages.wireguard: 0.0.20200105 -> 0.0.20200121

https://lists.zx2c4.com/pipermail/wireguard/2020-January/004870.html
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 56ab1751a91f..e1de74a18555 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "0.0.20200105";
+  version = "0.0.20200121";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "1b0amq4xjnl0bfxy6g0awbgnfymx3knd4ldai25z53j8f7d9xri7";
+    sha256 = "0h8jq8ki998jw4fynb7if4hcgnl0w6lbd5zwiy0xljj3mfqxdxvv";
   };
 
   preConfigure = ''

From a50cb675dded1d6eaaaa5d3e257e8b974bdf53d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 17:00:27 +0000
Subject: [PATCH 357/755] gnome3.iagno: 3.34.3 -> 3.34.4

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

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 33cd60f52720..9f1b52990caa 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1m9654dbi4vrl59wvbyxz7jf81v4mn4n5lcq7abb42lba965d2z2";
+    sha256 = "0v0x2dmgcgfcjmbx21arnrwdx9xwa5q05wrm8a9sgrjjzqx6ynwb";
   };
 
   nativeBuildInputs = [

From 8f8c833bc1a4091df42cf0ec6290cee40e13e84e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 17:04:55 +0000
Subject: [PATCH 358/755] jython: 2.7.1 -> 2.7.2b2

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

diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 0e1734565f2f..84941f9a6fa6 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "jython";
 
-  version = "2.7.1";
+  version = "2.7.2b2";
 
   src = fetchurl {
     url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4";
+    sha256 = "0mmrrydr94q2siwjynkw1gw677navmcvjvbi1jpdbp6idfx0jh6b";
   };
 
   buildInputs = [ makeWrapper ];

From 35363c3efa24e44a625219c65c43853c4e25e86b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 11:05:48 -0600
Subject: [PATCH 359/755] gitAndTools.hub: 2.13.0 -> 2.14.1

https://github.com/github/hub/releases/tag/v2.14.1
https://github.com/github/hub/releases/tag/v2.14.0
---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index ee21a2158ac6..1b67b933cb1c 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 {
   pname = "hub";
-  version = "2.13.0";
+  version = "2.14.1";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "18b0r16fk5wahvysqvg6vzjr7smyc2sdxp9sf55viby3kkwjfbkh";
+    sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1";
   };
 
   nativeBuildInputs = [ groff utillinux ];

From 62adf1c56bcc8b812d626f6e9d0fabbfc547f4b6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 10:13:02 -0600
Subject: [PATCH 360/755] nudoku: init at 2.0.0

(cherry picked from commit 7b0057f41f29bc18608e812bde551e19c994dbe1)
---
 pkgs/games/nudoku/default.nix   | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/games/nudoku/default.nix

diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix
new file mode 100644
index 000000000000..f70d3ec2d0ba
--- /dev/null
+++ b/pkgs/games/nudoku/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }:
+
+stdenv.mkDerivation rec {
+  pname = "nudoku";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "jubalh";
+    repo = pname;
+    rev = version;
+    sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig gettext ];
+  buildInputs = [ ncurses ];
+
+  meta = with stdenv.lib; {
+    description = "An ncurses based sudoku game";
+    homepage = "http://jubalh.github.io/nudoku/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36bfc03a8785..41cd201db47b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23141,6 +23141,8 @@ in
 
   newtonwars = callPackage ../games/newtonwars { };
 
+  nudoku = callPackage ../games/nudoku { };
+
   nxengine-evo = callPackage ../games/nxengine-evo { };
 
   odamex = callPackage ../games/odamex { };

From 52332244bd9626e36018b5c58b8df6d6b5111c43 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 10:17:50 -0600
Subject: [PATCH 361/755] nudoku: fix w/musl, disable nls

(cherry picked from commit 027b93ae5f1efe713dc213d56f0f2e4d9858db54)
---
 pkgs/games/nudoku/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix
index f70d3ec2d0ba..b76e967ebb63 100644
--- a/pkgs/games/nudoku/default.nix
+++ b/pkgs/games/nudoku/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig gettext ];
   buildInputs = [ ncurses ];
 
+  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls";
+
   meta = with stdenv.lib; {
     description = "An ncurses based sudoku game";
     homepage = "http://jubalh.github.io/nudoku/";

From 7187eae18926f2ba0be33cab2e17b30d7c3082d1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 11:11:43 -0600
Subject: [PATCH 362/755] nudoku: fix for gettext 0.20

---
 pkgs/games/nudoku/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix
index b76e967ebb63..b9e521bce369 100644
--- a/pkgs/games/nudoku/default.nix
+++ b/pkgs/games/nudoku/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h";
   };
 
+  # Allow gettext 0.20
+  postPatch = ''
+    substituteInPlace configure.ac --replace 0.19 0.20
+  '';
+
   nativeBuildInputs = [ autoreconfHook pkgconfig gettext ];
   buildInputs = [ ncurses ];
 

From 7ccb1dbb411191c7a3957e7fa51495177c3a50a4 Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Mon, 20 Jan 2020 13:49:14 +0100
Subject: [PATCH 363/755] morph: add openssh to PATH

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

diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index b111386fea2e..d0cd7127c50c 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, go-bindata, lib }:
+{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
 
 buildGoPackage rec {
   pname = "morph";
@@ -14,6 +14,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/dbcdk/morph";
   goDeps = ./deps.nix;
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ go-bindata ];
 
   buildFlagsArray = ''
@@ -29,6 +30,7 @@ buildGoPackage rec {
   postInstall = ''
     mkdir -p $lib
     cp -v $src/data/*.nix $lib
+    wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
   '';
 
   outputs = [ "out" "bin" "lib" ];

From db6392dae9e5819cedc3650f3b958c429b810b50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 17:57:34 +0000
Subject: [PATCH 364/755] health-check: 0.03.04 -> 0.03.05

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

diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix
index d45f6c5f8964..694d4565d969 100644
--- a/pkgs/os-specific/linux/health-check/default.nix
+++ b/pkgs/os-specific/linux/health-check/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "health-check";
-  version = "0.03.04";
+  version = "0.03.05";
 
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0p85ai31n9hh6d4b79zzlczf9arsy7vmkjak1x3g9f5qj8fy4avp";
+    sha256 = "1qxmkdl4pa043yg4kq5ffapm0c2cmm64h3v2c3xhnx0ad5pbhy5z";
   };
 
   buildInputs = [ json_c libbsd ];

From b5b28ec40739a6c62c5a173673d3b64edeb6e6ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 18:31:40 +0000
Subject: [PATCH 365/755] homebank: 5.2.8 -> 5.3.1

---
 pkgs/applications/office/homebank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index f72f820fd23d..683cddde5ec8 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.2.8";
+  name = "homebank-5.3.1";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y";
+    sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From aed4be2de32d0c7b2baeec27d6ac96136189da7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 18:55:15 +0000
Subject: [PATCH 366/755] icmake: 9.02.09 -> 9.03.01

---
 pkgs/development/tools/build-managers/icmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 48a719c7c267..7135790c1bdc 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "icmake";
-  version = "9.02.09";
+  version = "9.03.01";
 
   src = fetchFromGitLab {
-    sha256 = "0f4vyqgjribwa60j3a1c2xv69zllc7rfhaafq0jj1mdy8hdzvxpd";
+    sha256 = "05r0a69w0hv2qhjpb2bxd0lmp2vv5r2d4iggg6ly4miam0i318jy";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";

From beb1b9f28e6e120b61db0555f4b1dd0260e30e3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 18:59:49 +0000
Subject: [PATCH 367/755] libjpeg_original: 9c -> 9d

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

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 96dbd463370b..abd6c7bbf6c3 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "libjpeg-9c";
+  name = "libjpeg-9d";
 
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz;
-    sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5";
+    url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz;
+    sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr";
   };
 
   configureFlags = optional static "--enable-static --disable-shared";

From be5c93605a2311eacda0f2a25b7e7d6b26e6cd07 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 19:51:48 +0000
Subject: [PATCH 368/755] languagetool: 4.7 -> 4.8

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

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index f6ca3a7d760f..8d9e44f1b860 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "LanguageTool";
-  version = "4.7";
+  version = "4.8";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${pname}-${version}.zip";
-    sha256 = "08200f9vk157jv27lmm89rsf9r05sb6jxcmnphrpz1hxykixd294";
+    sha256 = "0xhzrrw52mqsv3n1rr98p8zi84i63gpcd104ahkkhhyzwvy9kprc";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From c9496d1ec03ba3c963a4e4e91c84e2a8ba4d6c7a Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Wed, 8 Jan 2020 08:09:10 -0500
Subject: [PATCH 369/755] pythonPackages.avro-python3: 1.8.2 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index c9db39a325fa..46272a5418d1 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "avro-python3";
-  version = "1.8.2";
+  version = "1.9.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f82cf0d66189600b1e6b442f650ad5aca6c189576723dcbf6f9ce096eab81bd6";
+    sha256 = "daab2cea71b942a1eb57d700d4a729e9d6cd93284d4dd4d65a378b9f958aa0d2";
   };
 
   doCheck = false;        # No such file or directory: './run_tests.py

From 5de2bff50a7d98764e3175fb2d3c80c231685468 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Tue, 21 Jan 2020 21:19:09 +0100
Subject: [PATCH 370/755] pypi2nix: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 8ecdfb6787f1..980aa0f09ea5 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -4,10 +4,10 @@ with python3;
 
 pkgs.buildPythonApplication rec {
   pname = "pypi2nix";
-  version = "2.0.3";
+  version = "2.0.4";
   src = pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0mja8q5lc0lils6s0v0l35knsj7n7779kw246jfmyvkc3l07j8df";
+    sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d";
   };
   propagatedBuildInputs = with pkgs; [
     attrs

From fe2af7506647fee07b7048b43fcb3eab02b19dda Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 13:24:03 -0500
Subject: [PATCH 371/755] python3Packages.dash-core-components: init at 1.7.0

---
 .../dash-core-components/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/dash-core-components/default.nix

diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix
new file mode 100644
index 000000000000..7d5f7aaba068
--- /dev/null
+++ b/pkgs/development/python-modules/dash-core-components/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "dash_core_components";
+  version = "1.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16jjanq4glj6c2cwyw94954hrqqv49fknisbxj03lfmflg61j32k";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "A dash component starter pack";
+    homepage = https://dash.plot.ly/dash-core-components;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a5c4a18f368..0c71ded90b80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2446,6 +2446,8 @@ in {
 
   daphne = callPackage ../development/python-modules/daphne { };
 
+  dash-core-components = callPackage ../development/python-modules/dash-core-components { };
+
   dateparser = callPackage ../development/python-modules/dateparser { };
 
   # Actual name of package

From a6bea71dabb32141a79229430626c9a5d7c8f1e9 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 13:24:34 -0500
Subject: [PATCH 372/755] python3Packages.dash-html-components: init at 1.0.2

---
 .../dash-html-components/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/dash-html-components/default.nix

diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix
new file mode 100644
index 000000000000..91604e3923be
--- /dev/null
+++ b/pkgs/development/python-modules/dash-html-components/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "dash_html_components";
+  version = "1.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "166agkrl52j5qin2npsdl2a96jccxz5f1jvcz0hxsnjg0ix0k4l9";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "HTML components for Dash";
+    homepage = https://dash.plot.ly/dash-html-components;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c71ded90b80..18fd33a03aaf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2448,6 +2448,8 @@ in {
 
   dash-core-components = callPackage ../development/python-modules/dash-core-components { };
 
+  dash-html-components = callPackage ../development/python-modules/dash-html-components { };
+
   dateparser = callPackage ../development/python-modules/dateparser { };
 
   # Actual name of package

From c8007a7413d9843b375ead241877bdf6d9649cf4 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 13:25:35 -0500
Subject: [PATCH 373/755] python3Packages.dash-renderer: init at 1.2.3

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

diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
new file mode 100644
index 000000000000..70a78453fa51
--- /dev/null
+++ b/pkgs/development/python-modules/dash-renderer/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "dash_renderer";
+  version = "1.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ccsykv24dz9xj24106aaj7f0w7x7sv7mamjbx0m6k0wyhh58vw1";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "Renderer for the Dash framework";
+    homepage = https://dash.plot.ly/;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18fd33a03aaf..5a0596536d9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2450,6 +2450,8 @@ in {
 
   dash-html-components = callPackage ../development/python-modules/dash-html-components { };
 
+  dash-renderer = callPackage ../development/python-modules/dash-renderer { };
+
   dateparser = callPackage ../development/python-modules/dateparser { };
 
   # Actual name of package

From 603034616615c4fef0576234decc847c708ac9f7 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 13:25:54 -0500
Subject: [PATCH 374/755] python3Packages.dash-core-components: init at 4.6.0

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

diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix
new file mode 100644
index 000000000000..6c5de8e72708
--- /dev/null
+++ b/pkgs/development/python-modules/dash-table/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "dash_table";
+  version = "4.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01wzac09ac6nr27if1liaxafzdf67x00vw1iq5vaad1147rdh36k";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "A First-Class Interactive DataTable for Dash";
+    homepage = https://dash.plot.ly/datatable;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a0596536d9b..1cec534fe59f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2452,6 +2452,8 @@ in {
 
   dash-renderer = callPackage ../development/python-modules/dash-renderer { };
 
+  dash-table = callPackage ../development/python-modules/dash-table { };
+
   dateparser = callPackage ../development/python-modules/dateparser { };
 
   # Actual name of package

From de6fabbe66d910a6ccc1ee18013195d68d070a07 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 13:26:11 -0500
Subject: [PATCH 375/755] python3Packages.dash: init at 1.8.0

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

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
new file mode 100644
index 000000000000..b813cac03d86
--- /dev/null
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, plotly
+, flask
+, flask-compress
+, future
+, dash-core-components
+, dash-renderer
+, dash-html-components
+, dash-table
+, pytest
+, pytest-mock
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "dash";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "plotly";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "11skbvjlj93aw1pqx6j56h73sy9r06jwq7z5h64fd1a3d4z2gsvy";
+  };
+
+  propagatedBuildInputs = [
+    plotly
+    flask
+    flask-compress
+    future
+    dash-core-components
+    dash-renderer
+    dash-html-components
+    dash-table
+  ];
+
+  checkInputs = [
+    pytest
+    pytest-mock
+    mock
+  ];
+
+  checkPhase = ''
+    pytest tests/unit/test_configs.py
+    pytest tests/unit/test_fingerprint.py
+    pytest tests/unit/test_import.py
+    pytest tests/unit/test_resources.py
+    pytest tests/unit/dash/
+  '';
+
+  pythonImportsCheck = [
+    "dash"
+  ];
+
+  meta = with lib; {
+    description = "Python framework for building analytical web applications";
+    homepage = https://dash.plot.ly/;
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1cec534fe59f..460ef565088b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2446,6 +2446,8 @@ in {
 
   daphne = callPackage ../development/python-modules/daphne { };
 
+  dash = callPackage ../development/python-modules/dash { };
+
   dash-core-components = callPackage ../development/python-modules/dash-core-components { };
 
   dash-html-components = callPackage ../development/python-modules/dash-html-components { };

From 2ad6b93ba3cab30baf14870bb813b3a90280f203 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 16:57:14 -0500
Subject: [PATCH 376/755] maintainers: add antoinerg

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a63968e172ee..2730218f48f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -517,6 +517,12 @@
     githubId = 5327697;
     name = "Anatolii Prylutskyi";
   };
+  antoinerg = {
+    email = "roygobeil.antoine@gmail.com";
+    github = "antoinerg";
+    githubId = 301546;
+    name = "Antoine Roy-Gobeil";
+  };
   anton-dessiatov = {
     email = "anton.dessiatov@gmail.com";
     github = "anton-dessiatov";

From a8c36dbb58bfd407123886be97c7d484a723894f Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Fri, 17 Jan 2020 16:57:32 -0500
Subject: [PATCH 377/755] add antoinerg as maintainer of python3Packages.dash-*

---
 .../python-modules/dash-core-components/default.nix          | 5 +++--
 .../python-modules/dash-html-components/default.nix          | 5 +++--
 pkgs/development/python-modules/dash-renderer/default.nix    | 5 +++--
 pkgs/development/python-modules/dash-table/default.nix       | 5 +++--
 pkgs/development/python-modules/dash/default.nix             | 3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix
index 7d5f7aaba068..dfcbb9b6404a 100644
--- a/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/pkgs/development/python-modules/dash-core-components/default.nix
@@ -15,9 +15,10 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A dash component starter pack";
     homepage = https://dash.plot.ly/dash-core-components;
-    license = with lib.licenses; [ mit ];
+    license = licenses.mit;
+    maintainers = [ maintainers.antoinerg ];
   };
 }
diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix
index 91604e3923be..4e9ef39b411b 100644
--- a/pkgs/development/python-modules/dash-html-components/default.nix
+++ b/pkgs/development/python-modules/dash-html-components/default.nix
@@ -15,9 +15,10 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "HTML components for Dash";
     homepage = https://dash.plot.ly/dash-html-components;
-    license = with lib.licenses; [ mit ];
+    license = licenses.mit;
+    maintainers = [ maintainers.antoinerg ];
   };
 }
diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
index 70a78453fa51..97942a13043b 100644
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/pkgs/development/python-modules/dash-renderer/default.nix
@@ -15,9 +15,10 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Renderer for the Dash framework";
     homepage = https://dash.plot.ly/;
-    license = with lib.licenses; [ mit ];
+    license = licenses.mit;
+    maintainers = [ maintainers.antoinerg ];
   };
 }
diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix
index 6c5de8e72708..4a9a6c42ff48 100644
--- a/pkgs/development/python-modules/dash-table/default.nix
+++ b/pkgs/development/python-modules/dash-table/default.nix
@@ -15,9 +15,10 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A First-Class Interactive DataTable for Dash";
     homepage = https://dash.plot.ly/datatable;
-    license = with lib.licenses; [ mit ];
+    license = licenses.mit;
+    maintainers = [ maintainers.antoinerg ];
   };
 }
diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index b813cac03d86..2106235230f8 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -57,6 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python framework for building analytical web applications";
     homepage = https://dash.plot.ly/;
-    license = with lib.licenses; [ mit ];
+    license = licenses.mit;
+    maintainers = [ maintainers.antoinerg ];
   };
 }

From 1accfe77b73c9b2e9b481792b8fd35d0a58d07ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2020 21:53:28 +0100
Subject: [PATCH 378/755] shotcut: auto-detection of VAAPI rendering is broken
 again

The 'connection=x11' parameter to ffmpeg breaks hardware
rendering with my Radeon RX 590 card. If we just drop that
option, everything works fine.
---
 ...cpp-connect-to-VAAPI-via-DRM-not-X11.patch | 33 +++++++++++++++++++
 pkgs/applications/video/shotcut/default.nix   |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch

diff --git a/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch b/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
new file mode 100644
index 000000000000..475788ba3a40
--- /dev/null
+++ b/pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
@@ -0,0 +1,33 @@
+From 247baa7e9210bbe5462b6155014c3dcd4a60e56a Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Tue, 24 Sep 2019 10:27:17 +0200
+Subject: [PATCH] encodedock.cpp: connect to VAAPI via DRM, not X11
+
+---
+ src/docks/encodedock.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
+index f2d64fc8..63d20787 100644
+--- a/src/docks/encodedock.cpp
++++ b/src/docks/encodedock.cpp
+@@ -766,7 +766,6 @@ Mlt::Properties* EncodeDock::collectProperties(int realtime)
+                     setIfNotSet(p, "pix_fmt", "nv12");
+                 } else if (vcodec.endsWith("_vaapi")) {
+                     setIfNotSet(p, "vprofile", "main");
+-                    setIfNotSet(p, "connection_type", "x11");
+                 }
+             }
+             setIfNotSet(p, "width", ui->widthSpinner->value());
+@@ -1890,7 +1889,7 @@ void EncodeDock::on_hwencodeCheckBox_clicked(bool checked)
+             QStringList args;
+             args << "-hide_banner" << "-f" << "lavfi" << "-i" << "color=s=640x360" << "-frames" << "1" << "-an";
+             if (codec.endsWith("_vaapi"))
+-                args << "-init_hw_device" << "vaapi=vaapi0:,connection_type=x11" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload";
++                args << "-init_hw_device" << "vaapi=vaapi0" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload";
+             else if (codec == "hevc_qsv")
+                 args << "-load_plugin" << "hevc_hw";
+             args << "-c:v" << codec << "-f" << "rawvideo" << "pipe:";
+-- 
+2.24.1
+
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 33ce5c18028f..6926f7e8eae2 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -17,6 +17,8 @@ mkDerivation rec {
     sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
   };
 
+  patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ];
+
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [

From dc18433b69fdb7cec2904f4ef9745d8e379b5b3b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 21 Jan 2020 16:03:17 -0500
Subject: [PATCH 379/755] pantheon.elementary-gtk-theme:  5.4.0 -> 5.4.1

* Improve contrast in text selections https://github.com/elementary/stylesheet/pull/572
* Add border and background to selected image radios https://github.com/elementary/stylesheet/pull/576
---
 .../pantheon/artwork/elementary-gtk-theme/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 4a42bc3d5654..25c3f2201ef1 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-gtk-theme";
-  version = "5.4.0";
+  version = "5.4.1";
 
   repoName = "stylesheet";
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0dh7lqc9b4ciyzbphqw071xcg742fvlc7gz9l1q3nqjsa2k6xg80";
+    sha256 = "0fnh08wqlhvigkxp69xkdha19ny9j0hg4ycwhhwvyr0d0z47kilw";
   };
 
   passthru = {

From 2c4ab483e12c035cae3bf0a183583da088fdab34 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 21 Jan 2020 16:03:56 -0500
Subject: [PATCH 380/755] pantheon.elementary-screenshot-tool: 1.7.0 -> 1.7.1

https://github.com/elementary/screenshot/releases/tag/1.7.1
---
 .../pantheon/apps/elementary-screenshot-tool/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 8485a1df9f3a..befa2bbbb020 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
-  version = "1.7.0";
+  version = "1.7.1";
 
   repoName = "screenshot";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "09jcyy4drzpfxb1blln7hyjg5b7r8w5j5v7va2qhq31y7vzczh62";
+    sha256 = "179ib2ldvhdx3hks5lqyx2cvlkk3j1qccvlfwh2yd2bl79zpk3ma";
   };
 
   passthru = {

From 0c8041d502a332d26c936939c4907677fa9d7ae0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 21 Jan 2020 16:04:55 -0500
Subject: [PATCH 381/755] pantheon.switchboard-plug-mouse-touchpad: 2.3.1 ->
 2.4.0

https://github.com/elementary/switchboard-plug-mouse-touchpad/releases/tag/2.4.0
---
 .../apps/switchboard-plugs/mouse-touchpad/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 260b340c2239..5a4eaf79b384 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn";
+    sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7";
   };
 
   passthru = {

From 6557e9a0e78d52477c7fe21a211afec2910c3879 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 19 Jan 2020 14:13:56 +0100
Subject: [PATCH 382/755] pythonPackages.Flask-Sockets: init at 0.2.1

---
 .../python-modules/flask-sockets/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-sockets/default.nix

diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix
new file mode 100644
index 000000000000..aa29fd4fbc94
--- /dev/null
+++ b/pkgs/development/python-modules/flask-sockets/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, gevent
+, gevent-websocket
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-Sockets";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b";
+  };
+
+  propagatedBuildInputs = [
+    flask
+    gevent
+    gevent-websocket
+  ];
+
+  # upstream doesn't have any tests, single file
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "flask_sockets"
+  ];
+
+  meta = with lib; {
+    description = "Elegant WebSockets for your Flask apps";
+    homepage = "https://github.com/heroku-python/flask-sockets";
+    license = licenses.mit;
+    maintainers = [ maintainers.prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 460ef565088b..bfec5533ea12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3482,6 +3482,8 @@ in {
 
   flask-socketio = callPackage ../development/python-modules/flask-socketio { };
 
+  flask-sockets = callPackage ../development/python-modules/flask-sockets { };
+
   flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
 
   flask-swagger = callPackage ../development/python-modules/flask-swagger { };

From e86c8b69d59e38cc03f3f562d14946348c085613 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 19 Jan 2020 14:14:23 +0100
Subject: [PATCH 383/755] pythonPackages.runway-python: 0.5.7 -> 0.5.9

---
 .../python-modules/runway-python/default.nix      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix
index 5c60b6379e93..fca11c100cf0 100644
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ b/pkgs/development/python-modules/runway-python/default.nix
@@ -2,29 +2,38 @@
 , buildPythonPackage
 , fetchPypi
 , flask
+, flask-compress
 , flask-cors
+, flask-sockets
 , numpy
+, scipy
 , pillow
 , gevent
 , wget
 , six
 , colorcet
+, unidecode
+, urllib3
 }:
 
 buildPythonPackage rec {
   pname = "runway-python";
-  version = "0.5.7";
+  version = "0.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06e0138cc4cf2ddb7304502f5c7b53269ce73679c5784c8d6b423db04d179c18";
+    sha256 = "1d75c44008275213034977c75bc2dc6f419e7f11d087984e3faea1e0cf6da69d";
   };
 
-  propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ];
+  propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ];
 
   # tests are not packaged in the released tarball
   doCheck = false;
 
+  pythonImportsCheck = [
+    "runway"
+  ];
+
   meta = {
     description = "Helper library for creating Runway models";
     homepage = https://github.com/runwayml/model-sdk;

From ca931caf160bd967a89d9c8f9b37ae182022a7f8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 21 Jan 2020 16:34:09 -0500
Subject: [PATCH 384/755] uboot: 2019.10 -> 2020.01

In addition, removes the python2 dependency. Anyway, it was required for
the updated revision to build.
---
 pkgs/misc/uboot/default.nix | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 5bd20c0765bc..c373364103fb 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -6,10 +6,10 @@
 }:
 
 let
-  defaultVersion = "2019.10";
+  defaultVersion = "2020.01";
   defaultSrc = fetchurl {
     url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
-    sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
+    sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
   };
   buildUBoot = {
     version ? null
@@ -28,19 +28,7 @@ let
 
     src = if src == null then defaultSrc else src;
 
-    patches = [
-      # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
-        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
-      })
-      # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/
-      (fetchpatch {
-        name = "rockchip-allow-loading-larger-kernels.patch";
-        url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw";
-        sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p";
-      })
-    ] ++ extraPatches;
+    patches = extraPatches;
 
     postPatch = ''
       patchShebangs tools
@@ -53,7 +41,7 @@ let
       dtc
       flex
       openssl
-      (buildPackages.python2.withPackages (p: [ p.libfdt ]))
+      (buildPackages.python3.withPackages (p: [ p.libfdt ]))
       swig
     ];
     depsBuildBuild = [ buildPackages.stdenv.cc ];

From 7943c33087b2b3d4d10a935bc152fc9dbbca7fd8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 21 Jan 2020 17:07:33 -0500
Subject: [PATCH 385/755] uboot: ubootBeagleboneBlack -> ubootAmx335xEVM

See u-boot@8fa7f65dd02c176ee6021eaf40114560b8954ba2

>    configs: Remove am335x_boneblack_defconfig
>
>    The am335x_evm_defconfig supports all am335x_boneblack variants. Remove
>    the redundant am335x_boneblack_defconfig.
---
 pkgs/misc/uboot/default.nix     | 12 ++++++------
 pkgs/top-level/aliases.nix      |  1 +
 pkgs/top-level/all-packages.nix |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index c373364103fb..29dfb6558a9f 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -112,6 +112,12 @@ in {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootAmx335xEVM = buildUBoot {
+    defconfig = "am335x_evm_defconfig";
+    extraMeta.platforms = ["armv7l-linux"];
+    filesToInstall = ["MLO" "u-boot.img"];
+  };
+
   ubootBananaPi = buildUBoot {
     defconfig = "Bananapi_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -131,12 +137,6 @@ in {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootBeagleboneBlack = buildUBoot {
-    defconfig = "am335x_boneblack_defconfig";
-    extraMeta.platforms = ["armv7l-linux"];
-    filesToInstall = ["MLO" "u-boot.img"];
-  };
-
   # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
   ubootClearfog = buildUBoot {
     defconfig = "clearfog_defconfig";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 68dfe49545a4..d9302b19f622 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -442,6 +442,7 @@ mapAliases ({
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
   truecrypt = veracrypt; # added 2018-10-24
   tshark = wireshark-cli; # added 2018-04-25
+  ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 245abf731dda..f3fd9d67408b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17084,7 +17084,7 @@ in
     ubootBananaPi
     ubootBananaPim3
     ubootBananaPim64
-    ubootBeagleboneBlack
+    ubootAmx335xEVM
     ubootClearfog
     ubootGuruplug
     ubootJetsonTK1

From 338c151139aa40ec03f1c304fc19bef9217eb58b Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 16:10:28 -0500
Subject: [PATCH 386/755] pythonPackages.nest-asyncio: build without tests

Tests fail on v1.2.1 & old v1.2.0.
This disables the tests to allow this package to build.
There doesn't seem to be an easy fix to allow running tests, b/c
the GitHub repo doesn't have release tags.
---
 pkgs/development/python-modules/nest-asyncio/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index a88c07c99687..0016da922ff3 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -14,6 +14,11 @@ buildPythonPackage rec {
     sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc";
   };
 
+  # tests not packaged with source dist as of 1.2.1/1.2.2, and
+  # can't check tests out of GitHub easily without specific commit IDs (no tagged releases)
+  doCheck = false;
+  pythonImportsCheck = [ "nest_asyncio" ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/erdewit/nest_asyncio;
     description = "Patch asyncio to allow nested event loops";

From 3937313195eca157d06f13fabd66d45721548031 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 23:24:43 +0000
Subject: [PATCH 387/755] m4rie: 20150908 -> 20200115

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

diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 6a91230002a0..6a7ecdf46fd9 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20150908";
+  version = "20200115";
   pname = "m4rie";
 
   src = fetchFromBitbucket {
     owner = "malb";
     repo = "m4rie";
     rev = "release-${version}";
-    sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss";
+    sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8";
   };
 
   doCheck = true;

From 51b26d4eaf14bd9ca6a7fe014b0eaa9dc50b5ba1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 23:31:35 +0000
Subject: [PATCH 388/755] libpst: 0.6.72 -> 0.6.74

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

diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index 564fb96d0be4..24b948271223 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -2,11 +2,11 @@
   pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "libpst-0.6.72";
+  name = "libpst-0.6.74";
 
   src = fetchurl {
     url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
-    sha256 = "01ymym0218805g7bqhr7x2rlhzsbsbidi3nr0z2r2w07xf8xh6ca";
+    sha256 = "0dzx8jniz7mczbbp08zfrl46h27hyfrsnjxmka9pi5aawzfdm1zp";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 813678058f5f5d5ce430fd387591e7815c2b92b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 23:46:57 +0000
Subject: [PATCH 389/755] m4ri: 20140914 -> 20200115

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

diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index 764901adf7b4..50e0c576e696 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20140914";
+  version = "20200115";
   pname = "m4ri";
 
   src = fetchFromBitbucket {
     owner = "malb";
     repo = "m4ri";
     rev = "release-${version}";
-    sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3";
+    sha256 = "1c17casrw6dvwj067kfcgyjjajfisz56s30wjv7fwaw55mqrny19";
   };
 
   doCheck = true;

From bb92cfdda2108184bb685181860ae20f41beeaab Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 17 Jan 2020 07:58:30 +0000
Subject: [PATCH 390/755] pythonPackages.denonavr: init at 0.7.10

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

diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
new file mode 100644
index 000000000000..33c1570060e5
--- /dev/null
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests
+, pytest, testtools, requests-mock }:
+
+buildPythonPackage rec {
+  pname = "denonavr";
+  version = "0.7.10";
+
+  src = fetchFromGitHub {
+    owner = "scarface-4711";
+    repo = "denonavr";
+    rev = version;
+    sha256 = "078nhr69f68nfazhmkf2sl7wiadqx96a5ry3ziggiy1xs04vflj7";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  doCheck = !isPy27;
+  checkInputs = [ pytest testtools requests-mock ];
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/scarface-4711/denonavr";
+    description = "Automation Library for Denon AVR receivers.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfec5533ea12..50b73ea5871a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -562,6 +562,8 @@ in {
 
   dendropy = callPackage ../development/python-modules/dendropy { };
 
+  denonavr = callPackage ../development/python-modules/denonavr { };
+
   dependency-injector = callPackage ../development/python-modules/dependency-injector { };
 
   btchip = callPackage ../development/python-modules/btchip { };

From 4249db11a617b740caa0278c634fbe4e2dc1bc4f Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 20 Jan 2020 18:30:48 -0800
Subject: [PATCH 391/755] plexapi: init at 3.2.0

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

diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix
new file mode 100644
index 000000000000..ed95de9ffde6
--- /dev/null
+++ b/pkgs/development/python-modules/plexapi/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests
+, tqdm, websocket_client, pytest, pillow, mock, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "PlexAPI";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "pkkid";
+    repo = "python-plexapi";
+    rev = version;
+    sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf";
+  };
+
+  propagatedBuildInputs = [ requests tqdm websocket_client ];
+
+  checkInputs = [ pytest pillow ]
+    ++ lib.optionals isPy27 [ mock ];
+
+  meta = with lib; {
+    homepage = "https://github.com/pkkid/python-plexapi";
+    description = "Python bindings for the Plex API";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50b73ea5871a..46dc39cb9d58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2960,6 +2960,8 @@ in {
 
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {};
 
+  plexapi = callPackage ../development/python-modules/plexapi { };
+
   plotly = callPackage ../development/python-modules/plotly { };
 
   plyfile = callPackage ../development/python-modules/plyfile { };

From 51c0802bad7f35d8d3d6f3a0c42e2506ece4e443 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 20 Jan 2020 18:31:20 -0800
Subject: [PATCH 392/755] plexauth: init at 0.0.5

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

diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix
new file mode 100644
index 000000000000..91407a907a44
--- /dev/null
+++ b/pkgs/development/python-modules/plexauth/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "plexauth";
+  version = "0.0.5";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "jjlawren";
+    repo = "python-plexauth";
+    rev = "v${version}";
+    sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # package does not include tests
+  doCheck = false;
+
+  # at least guarantee the module can be imported
+  pythonImportsCheck = [
+    "plexauth"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/jjlawren/python-plexauth/";
+    description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46dc39cb9d58..422e03cdffcb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2962,6 +2962,8 @@ in {
 
   plexapi = callPackage ../development/python-modules/plexapi { };
 
+  plexauth = callPackage ../development/python-modules/plexauth { };
+
   plotly = callPackage ../development/python-modules/plotly { };
 
   plyfile = callPackage ../development/python-modules/plyfile { };

From 4e26252c3df4fbe993721bacab5a0ca08d11179e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 20 Jan 2020 18:31:30 -0800
Subject: [PATCH 393/755] plexwebsocket: init at 0.0.6

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

diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix
new file mode 100644
index 000000000000..383a37cee3fe
--- /dev/null
+++ b/pkgs/development/python-modules/plexwebsocket/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "plexwebsocket";
+  version = "0.0.6";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "jjlawren";
+    repo = "python-plexwebsocket";
+    rev = "v${version}";
+    sha256 = "1sy9khxksimcmdvghg1ksk65mkiihjvhi7m7ms2kzmy7mrg3s3i7";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  # package does not include tests
+  doCheck = false;
+
+  # at least guarantee the module can be imported
+  pythonImportsCheck = [
+    "plexwebsocket"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/jjlawren/python-plexwebsocket/";
+    description = "Async library to react to events issued over Plex websockets";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 422e03cdffcb..2f854138ba16 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2964,6 +2964,8 @@ in {
 
   plexauth = callPackage ../development/python-modules/plexauth { };
 
+  plexwebsocket = callPackage ../development/python-modules/plexwebsocket { };
+
   plotly = callPackage ../development/python-modules/plotly { };
 
   plyfile = callPackage ../development/python-modules/plyfile { };

From 2dddf14da4c4e79aed9f1f6dee8a95f25e2eb4e9 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Mon, 20 Jan 2020 10:46:33 -0500
Subject: [PATCH 394/755] fluidasserts: 20.1.22554 -> 20.1.28253

- bumps the fluidasserts version to 20.1.28253
- in this version the build process is deterministic and
  reproducible (you'll get the same hash on multiple builds)
- see: https://gitlab.com/fluidattacks/asserts/issues/873
---
 .../python-modules/fluidasserts/default.nix   | 40 +++++--------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix
index da0d2d414073..f76692c50d97 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/pkgs/development/python-modules/fluidasserts/default.nix
@@ -57,13 +57,13 @@
 
 buildPythonPackage rec {
   pname = "fluidasserts";
-  version = "20.1.22554";
+  version = "20.1.28253";
   disabled = !isPy37;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0j7zppwingi9m58z51phy40d69jlskx1vgyz1gj9miqhbjfdymhi";
+    sha256 = "1d2smx9ywd1azsiwgavp69vlixmvwaabshprm192wnmprbghsp6c";
   };
 
   patchPhase = ''
@@ -82,6 +82,7 @@ buildPythonPackage rec {
       --replace "'pymssql==2.1.4'," "" \
       --replace "'pytesseract==0.3.0'," "" \
       --replace "'pywinrm==0.4.1'," "" \
+      --replace "'mitmproxy==5.0.1'," "" \
 
   '';
 
@@ -145,34 +146,13 @@ buildPythonPackage rec {
     rm test/conftest.py
 
     pytest \
-      test/test_cloud_aws_cloudformation_cloudfront.py \
-      test/test_cloud_aws_cloudformation_dynamodb.py \
-      test/test_cloud_aws_cloudformation_ec2.py \
-      test/test_cloud_aws_cloudformation_elb.py \
-      test/test_cloud_aws_cloudformation_elb2.py \
-      test/test_cloud_aws_cloudformation_fsx.py \
-      test/test_cloud_aws_cloudformation_iam.py \
-      test/test_cloud_aws_cloudformation_kms.py \
-      test/test_cloud_aws_cloudformation_rds.py \
-      test/test_cloud_aws_cloudformation_s3.py \
-      test/test_cloud_aws_cloudformation_secretsmanager.py \
-      test/test_format_apk.py \
-      test/test_format_file.py \
-      test/test_format_jks.py \
-      test/test_format_jwt.py \
-      test/test_format_pdf.py \
-      test/test_format_pkcs12.py \
-      test/test_format_string.py \
-      test/test_helper_asynchronous.py \
-      test/test_helper_crypto.py \
-      test/test_lang_core.py \
-      test/test_lang_csharp.py \
-      test/test_lang_docker.py \
-      test/test_lang_dotnetconfig.py \
-      test/test_lang_html.py \
-      test/test_lang_php.py \
-      test/test_lang_python.py \
-      test/test_lang_rpgle.py \
+      test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
+      test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
+      test/test_format_{apk,file,jks,jwt,pdf,pkcs12,string}.py \
+      test/test_helper_{asynchronous,crypto}.py \
+      test/test_lang_{javascript,java}.py \
+      test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \
+      test/test_utils_generic.py
 
   '';
 

From 359f235769bd64e8d1428122e8f81cd82cdc7dbd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 18:39:40 +0000
Subject: [PATCH 395/755] jetty: 9.4.24.v20191120 -> 9.4.25.v20191220

---
 pkgs/servers/http/jetty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 8d2340647cb4..4a3a3f2da016 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jetty";
-  version = "9.4.24.v20191120";
+  version = "9.4.25.v20191220";
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     name = "jetty-distribution-${version}.tar.gz";
-    sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4";
+    sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 35098e448b4fe04f93459b1d1bae0fc32c5bfc45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 07:11:10 +0000
Subject: [PATCH 396/755] flrig: 1.3.48 -> 1.3.49

---
 pkgs/applications/radio/flrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index 242536a89655..17d579cb45e5 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.48";
+  version = "1.3.49";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q";
+    sha256 = "0icfniiw2l7d7gyxrzy87n3ragzvf0ykvq7c10ppf111wl5in295";
   };
 
   buildInputs = [

From 5cbce718a5ead7f624359329630cdc7d5bd940bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2020 20:06:54 +0000
Subject: [PATCH 397/755] kmymoney: 5.0.7 -> 5.0.8

---
 pkgs/applications/office/kmymoney/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index c7b4377c3dcb..275cd826a69f 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kmymoney";
-  version = "5.0.7";
+  version = "5.0.8";
 
   src = fetchurl {
     url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "1h5mzvgpfyl2j66b3nsw17yxvg0ja1qhjlcmfkz62221vcqsrp6m";
+    sha256 = "1h6l01a08f1xgk4dfpndl7rmgbp9npm58qi760jwl2gggprwwsxc";
   };
 
   # Hidden dependency that wasn't included in CMakeLists.txt:

From 6b1937818e7f18ee7eac034cb9ccc84db0087dfc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 18:14:49 -0600
Subject: [PATCH 398/755] ocrmypdf: prefer patch + substituteAll

---
 pkgs/tools/text/ocrmypdf/default.nix   | 12 +++++++-----
 pkgs/tools/text/ocrmypdf/liblept.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/text/ocrmypdf/liblept.patch

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index a301e9310d97..020bba189de2 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -10,6 +10,7 @@
 , stdenv
 , tesseract4
 , unpaper
+, substituteAll
 }:
 
 let
@@ -68,11 +69,12 @@ in buildPythonApplication rec {
     setuptools
   ] ++ runtimeDeps;
 
-  postPatch = ''
-    substituteInPlace src/ocrmypdf/leptonica.py \
-      --replace '_libpath = find_library(libname)' \
-                '_libpath = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"'
-  '';
+  patches = [
+    (substituteAll {
+      src = ./liblept.patch;
+      liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
+    })
+  ];
 
   # The tests take potentially 20+ minutes, depending on machine
   doCheck = false;
diff --git a/pkgs/tools/text/ocrmypdf/liblept.patch b/pkgs/tools/text/ocrmypdf/liblept.patch
new file mode 100644
index 000000000000..ed413a8b37bd
--- /dev/null
+++ b/pkgs/tools/text/ocrmypdf/liblept.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py
+index 328b063..b993cc9 100644
+--- a/src/ocrmypdf/leptonica.py
++++ b/src/ocrmypdf/leptonica.py
+@@ -46,7 +46,7 @@ if os.name == 'nt':
+     os.environ['PATH'] = shim_paths_with_program_files()
+ else:
+     libname = 'lept'
+-_libpath = find_library(libname)
++_libpath = '@liblept@'
+ if not _libpath:
+     raise MissingDependencyError(
+         """

From 61381b2f883c8b85919c41618d4e1aa6d829fe54 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Jan 2020 18:17:30 -0600
Subject: [PATCH 399/755] ocrmypdf: 9.4.0 -> 9.5.0

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

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 020bba189de2..cdc6878bb5a7 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
 
 in buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "9.4.0";
+  version = "9.5.0";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "07356syg7w9m9h4yl5zk2y4s8hsb7kybbm4x9vm7mli4gw9dwv1m";
+    sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy";
   };
 
   nativeBuildInputs = with python3Packages; [

From e95752f2724dd9a52a0fcbd94e9ffeccb9f30946 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 02:34:54 +0000
Subject: [PATCH 400/755] nextcloud: 17.0.2 -> 18.0.0

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 0d0aec4fb2ca..9fb7a2e3e0eb 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud";
-  version = "17.0.2";
+  version = "18.0.0";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1qrxalyyfjlv3myzkn5z33smfpv8r1ph2w9ax6jqivspq3zrc9gk";
+    sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r";
   };
 
   installPhase = ''

From d0dd44f176c7bffeef8e7db67c1bb27d8234ae10 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 02:54:59 +0000
Subject: [PATCH 401/755] metabase: 0.33.7.1 -> 0.34.1

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

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index e266ea71ee0f..69a92942f5ce 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.33.7.1";
+  version = "0.34.1";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1rx9v0vcrpsjsclap4x9ic9jwhyd24v1n1v8si18blzn3iyr8c36";
+    sha256 = "0fcggpv9ikx481ci7jw6phhmk3mqxbsn9pfs1kqmhwy1ka4ck6dg";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8ea2027f65d0898b6115b470215736ee73a001e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 03:24:53 +0000
Subject: [PATCH 402/755] munge: 0.5.13 -> 0.5.14

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

diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index 2d758aa2aecd..ee1858ad2845 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "munge-0.5.13";
+  name = "munge-0.5.14";
 
   src = fetchFromGitHub {
     owner = "dun";
     repo = "munge";
     rev = name;
-    sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70";
+    sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j";
   };
 
   nativeBuildInputs = [ autoreconfHook gawk gnused ];

From d4a95f016a20ac09728305e6734011b2a9ca96cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 04:47:14 +0000
Subject: [PATCH 403/755] crispyDoom: 5.6.3 -> 5.6.4

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

diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index 4fb4f301cfba..e85cebde0408 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crispy-doom";
-  version = "5.6.3";
+  version = "5.6.4";
 
   src = fetchFromGitHub {
     owner = "fabiangreffrath";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4";
+    sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2";
   };
 
   postPatch = ''

From b5933e295834b909ab2658b201fc94db03f194e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 03:55:00 +0000
Subject: [PATCH 404/755] mosquitto: 1.6.7 -> 1.6.8

---
 pkgs/servers/mqtt/mosquitto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 5b0f4eceaed9..b52cfb09d4f1 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.6.7";
+  version = "1.6.8";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "1g9g9c95ypfa9dv53ga3hjqxrrlqmcf1lmpxgrifl2l34q4zzfln";
+    sha256 = "1py13vg3vwwwg6jdnmq46z6rlzb84r4ggqsmsrn4yar5hrw9pa90";
   };
 
   postPatch = ''

From 10b05a9b77c913d53f8116f82e87ffc1ba15c065 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 03:03:35 +0000
Subject: [PATCH 405/755] mcfly: 0.3.1 -> 0.3.6

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

diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 4ea27ce092f7..f04226cdc048 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mcfly";
-  version = "0.3.1";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "cantino";
     repo = "mcfly";
     rev = "v${version}";
-    sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2";
+    sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j";
   };
 
   preInstall = ''

From a06cbffd16a7e65998dca6729770fb4bef04ab43 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Jan 2020 23:00:00 -0500
Subject: [PATCH 406/755] mcfly: enable on darwin

---
 pkgs/tools/misc/mcfly/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index f04226cdc048..7d85e709f73a 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mcfly";
@@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preInstall = ''
-    mkdir -p $out/share/mcfly
-    cp mcfly.bash $out/share/mcfly/
-    chmod +x $out/share/mcfly/mcfly.bash
+    install -Dm644 -t $out/share/mcfly mcfly.bash
   '';
 
   cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69";
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = https://github.com/cantino/mcfly;
     description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now.";
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = [ maintainers.melkor333 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aa4471e2b4e..43c489eb9332 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4540,7 +4540,9 @@ in
 
   mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
 
-  mcfly = callPackage ../tools/misc/mcfly { };
+  mcfly = callPackage ../tools/misc/mcfly {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   mdbook = callPackage ../tools/text/mdbook {
     inherit (darwin.apple_sdk.frameworks) CoreServices;

From 9bc06937b587e9ec77f11a8a5e1a39821d0b94df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 04:52:54 +0000
Subject: [PATCH 407/755] opera: 65.0.3467.48 -> 66.0.3515.36

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

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index c1ede5044492..b92c3d58741a 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -47,11 +47,11 @@ let
 in stdenv.mkDerivation rec {
 
   pname = "opera";
-  version = "65.0.3467.48";
+  version = "66.0.3515.36";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    sha256 = "0vcpq2p8si6rlyvd8nzs0a7pjxks2qn8i8czna968wyfxlczckyr";
+    sha256 = "1kmd8dxdid593a98a13n8k22hi1whvichda6qam2bqcz99rsczdd";
   };
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

From e9ad60904c5179c11b784573dbd7d60b95e00e65 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Wed, 22 Jan 2020 18:13:14 +1300
Subject: [PATCH 408/755] bitwig-studio3: 3.1.1 -> 3.1.2

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 0cff19819c01..64ee40e038ce 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -2,18 +2,16 @@
 
 bitwig-studio1.overrideAttrs (oldAttrs: rec {
   name = "bitwig-studio-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
-    sha256 = "1mgyyl1mr8hmzn3qdmg77km6sk58hyd0gsqr9jksh0a8p6hj24pk";
+    sha256 = "07djn52lz43ls6fa4k1ncz3m1nc5zv2j93hwyavnr66r0hlqy7l9";
   };
 
   buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
 
-  runtimeDependencies = [
-    pulseaudio
-  ];
+  runtimeDependencies = [ pulseaudio ];
 
   installPhase = ''
     ${oldAttrs.installPhase}

From dea2fe9f3991f01974b469bc2f16aebfe83b86ac Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 13 Jan 2020 12:07:48 +0100
Subject: [PATCH 409/755] boot.initrd.luks: Adding FIDO2 support

---
 nixos/modules/system/boot/luksroot.nix | 103 ++++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 0bb8396a44fc..2253b9251cdc 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -103,6 +103,33 @@ let
         fi
         return 0
     }
+
+    wait_fido2key () {
+        local secs="''${1:-10}"
+
+        fido2luks connected 1>/dev/null 2>&1
+        if [ $? != 0 ]; then
+            echo -n "Waiting $secs seconds for the FIDO2 key to appear..."
+            local success=false
+            for try in $(seq $secs); do
+                echo -n .
+                sleep 1
+                fido2luks connected 1>/dev/null 2>&1
+                if [ $? == 0 ]; then
+                    success=true
+                    break
+                fi
+            done
+            if [ $success == true ]; then
+                echo " - success";
+                return 0
+            else
+                echo " - failure";
+                return 1
+            fi
+        fi
+        return 0
+    }
   '';
 
   preCommands = ''
@@ -139,7 +166,7 @@ let
     umount /crypt-ramfs 2>/dev/null
   '';
 
-  openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, gpgCard, fallbackToPassword, ... }: assert name' == name;
+  openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, gpgCard, fido2, fallbackToPassword, ... }: assert name' == name;
   let
     csopen   = "cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} ${optionalString (header != null) "--header=${header}"}";
     cschange = "cryptsetup luksChangeKey ${device} ${optionalString (header != null) "--header=${header}"}";
@@ -387,7 +414,29 @@ let
     }
     ''}
 
-    ${if (luks.yubikeySupport && (yubikey != null)) || (luks.gpgSupport && (gpgCard != null)) then ''
+    ${optionalString (luks.fido2Support && (fido2.credential != null)) ''
+
+    open_with_hardware() {
+      local passsphrase
+
+      if wait_fido2key ${toString fido2.gracePeriod}; then
+          ${if fido2.passwordLess then ''
+            export passphrase=""
+          '' else ''
+            echo -n "FIDO2 salt for ${device}: "
+            read -rs passphrase
+            echo
+          ''}
+            echo "Waiting for your FIDO2 device..."
+            fido2luks -i open ${device} ${name} ${fido2.credential} --salt string:$passphrase
+        else
+            echo "No FIDO2 key found, falling back to normal open procedure"
+            open_normally
+        fi
+    }
+    ''}
+
+    ${if (luks.yubikeySupport && (yubikey != null)) || (luks.gpgSupport && (gpgCard != null)) || (luks.fido2Support && (fido2.credential != null)) then ''
     open_with_hardware
     '' else ''
     open_normally
@@ -608,6 +657,31 @@ in
             });
           };
 
+          fido2 = {
+            credential = mkOption {
+              default = null;
+              example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2";
+              type = types.str;
+              description = "The FIDO2 credential ID.";
+            };
+
+            gracePeriod = mkOption {
+              default = 10;
+              type = types.int;
+              description = "Time in seconds to wait for the FIDO2 key.";
+            };
+
+            passwordLess = mkOption {
+              default = false;
+              type = types.bool;
+              description = ''
+                Defines whatever to use an empty string as a default salt.
+
+                Enable only when your device is PIN protected, such as <link xlink:href="https://trezor.io/">Trezor</link>.
+              '';
+            };
+          };
+
           yubikey = mkOption {
             default = null;
             description = ''
@@ -706,6 +780,15 @@ in
             and a Yubikey to work with this feature.
           '';
     };
+
+    boot.initrd.luks.fido2Support = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enables support for authenticating with FIDO2 devices.
+      '';
+    };
+
   };
 
   config = mkIf (luks.devices != {} || luks.forceLuksSupportInInitrd) {
@@ -714,6 +797,14 @@ in
       [ { assertion = !(luks.gpgSupport && luks.yubikeySupport);
           message = "Yubikey and GPG Card may not be used at the same time.";
         }
+
+        { assertion = !(luks.gpgSupport && luks.fido2Support);
+          message = "FIDO2 and GPG Card may not be used at the same time.";
+        }
+
+        { assertion = !(luks.fido2Support && luks.yubikeySupport);
+          message = "FIDO2 and Yubikey may not be used at the same time.";
+        }
       ];
 
     # actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested
@@ -753,6 +844,11 @@ in
         chmod +x $out/bin/openssl-wrap
       ''}
 
+      ${optionalString luks.fido2Support ''
+        copy_bin_and_libs ${pkgs.fido2luks}/bin/fido2luks
+      ''}
+
+
       ${optionalString luks.gpgSupport ''
         copy_bin_and_libs ${pkgs.gnupg}/bin/gpg
         copy_bin_and_libs ${pkgs.gnupg}/bin/gpg-agent
@@ -783,6 +879,9 @@ in
         $out/bin/gpg-agent --version
         $out/bin/scdaemon --version
       ''}
+      ${optionalString luks.fido2Support ''
+        $out/bin/fido2luks --version
+      ''}
     '';
 
     boot.initrd.preFailCommands = postCommands;

From b02d4793234b2a77959edbc92b35ccb7bbc94bed Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 16 Jan 2020 14:36:35 +0100
Subject: [PATCH 410/755] doc: FIDO2 luks file system

---
 .../configuration/luks-file-systems.xml       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 8a2b107e0ee8..d3007843d68b 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -37,4 +37,38 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
   on an encrypted partition, it is necessary to add the following grub option:
 <programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
  </para>
+  <section xml:id="sec-luks-file-systems-fido2">
+  <title>FIDO2</title>
+
+  <para>
+   NixOS also supports unlocking your LUKS-Encrypted file system using a FIDO2 compatible token. In the following example, we will create a new FIDO2 credential
+   and add it as a new key to our existing device <filename>/dev/sda2</filename>:
+
+   <screen>
+# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME"
+# fido2luks credential "$FIDO2_LABEL"
+f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7
+
+# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7
+Password:
+Password (again):
+Old password:
+Old password (again):
+Added to key to device /dev/sda2, slot: 2
+</screen>
+
+  To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to <filename>configuration.nix</filename>:
+<programlisting>
+<link linkend="opt-boot.initrd.luks.fido2Support">boot.initrd.luks.fido2Support</link> = true;
+<link linkend="opt-boot.initrd.luks.devices._name__.fido2.credential">boot.initrd.luks.devices."/dev/sda2".fido2.credential</link> = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";
+</programlisting>
+
+  You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as <link xlink:href="https://trezor.io/">Trezor</link>.
+
+<programlisting>
+<link linkend="opt-boot.initrd.luks.devices._name__.fido2.passwordLess">boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess</link> = true;
+</programlisting>
+  </para>
+ </section>
+
 </section>

From a5798cf78ea3ff7ed3f8fadbea5e293c36c96d44 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 16 Jan 2020 14:43:40 +0100
Subject: [PATCH 411/755] rl-2003.xml: adding note about FIDO2 luks

---
 nixos/doc/manual/release-notes/rl-2003.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 1eef4f08c4fd..af91d72fb8f2 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -485,6 +485,12 @@ users.users.me =
        now uses the short rather than full version string.
      </para>
    </listitem>
+    <listitem>
+    <para>
+    It is now possible to unlock LUKS-Encrypted file systems using a FIDO2 token
+    via <option>boot.initrd.luks.fido2Support</option>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 5a19bf03d9c765f9c26be917dd3644b42c6c0b44 Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Wed, 22 Jan 2020 01:40:11 -0600
Subject: [PATCH 412/755] add jpas to maintainers

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2730218f48f7..13b6793c816b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3492,6 +3492,12 @@
     github = "jorsn";
     githubId = 4646725;
   };
+  jpas = {
+    name = "Jarrod Pas";
+    email = "jarrod@jarrodpas.com";
+    github = "jpas";
+    githubId = 5689724;
+  };
   jpdoyle = {
     email = "joethedoyle@gmail.com";
     github = "jpdoyle";

From 3aa2742e2ba21838f374db6330c4498b9468638e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 07:48:38 +0000
Subject: [PATCH 413/755] palemoon: 28.8.0 -> 28.8.1

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

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 21dd04610cda..76417d482b53 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -13,13 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "28.8.0";
+  version = "28.8.1";
 
   src = fetchFromGitHub {
     owner  = "MoonchildProductions";
     repo   = "UXP";
     rev    = "PM${version}_Release";
-    sha256 = "0swmwall8pyg905jnw6x1b6vcv92zb7ph3zqcymh4ay2liikh8c0";
+    sha256 = "055bmfgasxf7azjqry06bbgwx6ryrdc1zrcq8b217b6zb1in037x";
   };
 
   desktopItem = makeDesktopItem {

From 4b2f3cf09b92557309947dc93d1b6017e1057044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 20 Jan 2020 09:44:43 -0300
Subject: [PATCH 414/755] iconpack-obsidian: 4.9 -> 4.10

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index 64a982f60375..96514b6a4cda 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -2,20 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "iconpack-obsidian";
-  version = "4.9";
+  version = "4.10";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1w0lnr08gd0cnzv3n5094jqb7dpbpwwizfhvifdir0xsls1sf129";
+    sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix";
   };
 
   nativeBuildInputs = [ gtk3 ];
 
-  propagatedBuildInputs = [
-    hicolor-icon-theme
-  ];
+  propagatedBuildInputs = [ hicolor-icon-theme ];
 
   dontDropIconThemeCache = true;
 
@@ -31,8 +29,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Gnome Icon Pack based upon Faenza";
-    homepage = https://github.com/madmaxms/iconpack-obsidian;
+    description = "Gnome icon pack based upon Faenza";
+    homepage = "https://github.com/madmaxms/iconpack-obsidian";
     license = licenses.lgpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;

From a96ed5d70427bdc2fbb9e805784e1b9621157a98 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 20 Jan 2020 13:11:17 +0100
Subject: [PATCH 415/755] kubernetes: 1.16.4 -> 1.16.5

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index f852c3ac0a3a..a5e2b3743260 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.16.4";
+  version = "1.16.5";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "05rpwmzkxhbvckcs7hspy6krdfskd8jnsn9g43fhidjvqhxyh6n3";
+    sha256 = "12ks79sjgbd0c97pipid4j3l5fwiimaxa25rvmf2vccdrw4ngx4m";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a8d0ad91d6c..2bbc121b7ac0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19894,7 +19894,7 @@ in
   kubeval = callPackage ../applications/networking/cluster/kubeval { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-    go = buildPackages.go_1_12;
+    go = buildPackages.go_1_13;
   };
 
   kubeseal = callPackage ../applications/networking/cluster/kubeseal { };

From 4339f5803d9e23280108046565483a35e8588442 Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Wed, 22 Jan 2020 01:40:33 -0600
Subject: [PATCH 416/755] coqPackages.CoLoR 1.4.0 -> 1.6.0

The package is now developed on GitHub, so fetchurl was replace with
fetchFromGithub.
---
 pkgs/development/coq-modules/CoLoR/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 82c6e58a7b03..a14eafd7236d 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, coq, bignums }:
+{ stdenv, fetchFromGitHub, coq, bignums }:
 
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-CoLoR-1.4.0";
+  name = "coq${coq.coq-version}-CoLoR-1.6.0";
 
-  src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/37205/color.1.4.0.tar.gz;
-    sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag";
+  src = fetchFromGitHub {
+    owner = "fblanqui";
+    repo = "color";
+    rev = "328aa06270584b578edc0d2925e773cced4f14c8";
+    sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
   };
 
   buildInputs = [ coq bignums ];
@@ -15,14 +17,14 @@ stdenv.mkDerivation {
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with stdenv.lib ; {
     homepage = http://color.inria.fr/;
     description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
-    maintainers = with maintainers; [ jwiegley ];
+    maintainers = with maintainers; [ jpas jwiegley ];
     platforms = coq.meta.platforms;
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
   };
 }

From f6d0441bf57fc270de0e178059a190be830d0c1f Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Sun, 19 Jan 2020 18:04:16 -0500
Subject: [PATCH 417/755] postman: 7.14.0 -> 7.16.0

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 3a0a8f343568..5407f8408ea5 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.14.0";
+  version = "7.16.0";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "0565qvn5bnx1mc1ibxrqszzvls0gkg10js55439lwygfhkal0lvy";
+    sha256 = "1f68z4n0n2jj5ymssii82cswz4kw3dd3zkz26ahsbpsc2hr7ijxp";
     name = "${pname}.tar.gz";
   };
 

From d24a439d92cdb812f83e9f45b3e08465ce051596 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sat, 28 Dec 2019 19:26:51 +0300
Subject: [PATCH 418/755] imgp: init at 2.7

---
 pkgs/applications/graphics/imgp/default.nix | 38 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/graphics/imgp/default.nix

diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix
new file mode 100644
index 000000000000..80420202c053
--- /dev/null
+++ b/pkgs/applications/graphics/imgp/default.nix
@@ -0,0 +1,38 @@
+{ lib, fetchFromGitHub, buildPythonApplication, pillow, imgp }:
+
+buildPythonApplication rec {
+  pname = "imgp";
+  version = "2.7";
+
+  src = fetchFromGitHub {
+    owner = "jarun";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "13r4fn3dd0nyidfhrr7zzpls5ifbyqdwxhyvpkqr8ahchws7wfc6";
+  };
+
+  propagatedBuildInputs = [ pillow ];
+
+  installFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
+
+  postInstall = ''
+    install -Dm555 auto-completion/bash/imgp-completion.bash $out/share/bash-completion/completions/imgp.bash
+    install -Dm555 auto-completion/fish/imgp.fish -t $out/share/fish/vendor_completions.d
+    install -Dm555 auto-completion/zsh/_imgp -t $out/share/zsh/site-functions
+  '';
+
+  checkPhase = ''
+    $out/bin/imgp --help
+  '';
+
+  meta = with lib; {
+    description = "High-performance CLI batch image resizer & rotator";
+    homepage = "https://github.com/jarun/imgp";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ sikmir ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bbc121b7ac0..822e2ef525b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19703,6 +19703,8 @@ in
 
   imgcat = callPackage ../applications/graphics/imgcat { };
 
+  imgp = python3Packages.callPackage ../applications/graphics/imgp { };
+
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 

From 376d7878c2391e0a2e9be3c411a5eeaa9d7e0e52 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 24 Nov 2019 12:45:48 +0100
Subject: [PATCH 419/755] string-machine: init at unstable-2020-01-20

---
 .../audio/string-machine/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/audio/string-machine/default.nix

diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix
new file mode 100644
index 000000000000..67053baa35ff
--- /dev/null
+++ b/pkgs/applications/audio/string-machine/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "string-machine";
+  version = "unstable-2020-01-20";
+
+  src = fetchFromGitHub {
+    owner = "jpcima";
+    repo = pname;
+    rev = "188082dd0beb9a3c341035604841c53675fe66c4";
+    sha256 = "0l9xrzp3f0hk6h320qh250a0n1nbd6qhjmab21sjmrlb4ngy672v";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    patchShebangs ./dpf/utils/generate-ttl.sh
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    boost cairo lv2
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jpcima/string-machine";
+    description = "Digital model of electronic string ensemble instrument";
+    maintainers = [ maintainers.magnetophon ];
+    platforms = intersectLists platforms.linux platforms.x86;
+    license = licenses.boost;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 822e2ef525b6..b0f055a3d916 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2062,6 +2062,8 @@ in
 
   step-cli = callPackage ../tools/security/step-cli { };
 
+  string-machine = callPackage ../applications/audio/string-machine { };
+
   bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
 
   sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { };

From 8f30944b899b3dbaa601b61c3065eff285ba8780 Mon Sep 17 00:00:00 2001
From: Matthias Wimmer <m@tthias.eu>
Date: Mon, 20 Jan 2020 08:56:08 +0100
Subject: [PATCH 420/755] rosegarden: 19.06 -> 19.12

New upstream release
---
 pkgs/applications/audio/rosegarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index aaceab6dc084..8d8e3e1b6c0e 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -3,12 +3,12 @@
 , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
 
 stdenv.mkDerivation (rec {
-  version = "19.06";
+  version = "19.12";
   pname = "rosegarden";
 
   src = fetchurl {
     url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";
-    sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc";
+    sha256 = "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1";
   };
 
   patchPhase = ''

From 9588e9c89c566e3dec2aaf13915c90425e6e6b87 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 20 Jan 2020 09:28:17 -0500
Subject: [PATCH 421/755] pythonPackages.vega: build fix

vega 2.6 also depends on ipywidgets
---
 pkgs/development/python-modules/vega/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 2bfeccccc59f..73485329ef76 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage , fetchPypi
-, pytest, jupyter_core, pandas }:
+, pytest, jupyter_core, pandas, ipywidgets }:
 
 buildPythonPackage rec {
   pname = "vega";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytest ];
-  propagatedBuildInputs = [ jupyter_core pandas ];
+  propagatedBuildInputs = [ jupyter_core pandas ipywidgets ];
 
   meta = with stdenv.lib; {
     description = "An IPython/Jupyter widget for Vega and Vega-Lite";

From 37298b58c6039110e41320f01d0f560686e0c418 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 20 Jan 2020 07:46:17 -0500
Subject: [PATCH 422/755] pythonPackages.django-auth-ldap: update django
 dependency

Package `django-auth-ldap' requires Django 1.11+ which package `django' satisfies.
---
 pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index 3e95e7ff16ba..f0de263f1300 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi, isPy27
-, ldap , django_2_2 
+, ldap , django 
 , mock
 }:
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d";
   };
 
-  propagatedBuildInputs = [ ldap django_2_2 ]; 
+  propagatedBuildInputs = [ ldap django ]; 
   checkInputs = [ mock ]; 
 
   # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings

From 2176d2fc8d34477a3a0fe3fc98cc5bc215721527 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 02:25:16 +0000
Subject: [PATCH 423/755] argyllcms: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 1326d0454591..3f8bdf3ac6b2 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
 , libXdmcp, libXau, lib, openssl }:
 let
-  version = "2.1.1";
+  version = "2.1.2";
  in
 stdenv.mkDerivation rec {
   pname = "argyllcms";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
-    sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m";
+    sha256 = "1bsi795kphr1a8l2kvvm9qfkvgfpimds4ijalnmg23wnr8691md1";
 
     # The argyllcms web server doesn't like curl ...
     curlOpts = "--user-agent 'Mozilla/5.0'";

From 94de21577e30f9f7f1cb5ec21777d686b9c9a4bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2020 03:53:44 +0000
Subject: [PATCH 424/755] cppzmq: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index ccf38fa09fbb..78cefe89e3b8 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cppzmq";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
     rev = "v${version}";
-    sha256 = "1n34sj322ay8839q6cxivckkrhz9avy31615i5jdxfal06mgya43";
+    sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h";
   };
 
   nativeBuildInputs = [ cmake ];

From 5bd4028bdcfadd480a667b352c8273be9a86ba05 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 19 Jan 2020 14:14:53 +0100
Subject: [PATCH 425/755] runwayml: 0.10.11 -> 0.10.20

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

diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix
index 839a87214e64..c3f747837e01 100644
--- a/pkgs/applications/graphics/runwayml/default.nix
+++ b/pkgs/applications/graphics/runwayml/default.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "runwayml";
-  version = "0.10.11";
+  version = "0.10.20";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage";
-    sha256 = "0f3icgpwj1sk9bkycqw65c8bhrzzpw5yzacw52siv4j1gl4casnl";
+    sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz";
     name="${pname}-${version}.AppImage";
   };
 

From 99eb9231d4d97c561cca7a5ca7617531eac6c92d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 6 Nov 2019 07:42:55 -0800
Subject: [PATCH 426/755] ansible_2_9: init at 2.9.2

---
 .../python-modules/ansible/default.nix           |  4 ++--
 pkgs/tools/admin/ansible/default.nix             | 16 +++++++++++++---
 pkgs/top-level/all-packages.nix                  |  4 +++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 96be51e82f0c..df9c5e82cd13 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "ansible";
-  version = "2.8.7";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "ansible";
     repo = "ansible";
     rev = "v${version}";
-    sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8";
+    sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 5b724fb0bf90..197543945c2b 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -1,9 +1,19 @@
 { python3Packages, fetchurl }:
 
-{
-  ansible = with python3Packages; toPythonApplication ansible;
+rec {
+  ansible = ansible_2_8;
 
-  ansible_2_8 = with python3Packages; toPythonApplication ansible;
+  ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
+
+  ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
+    pname = "ansible";
+    version = "2.8.6";
+
+    src = fetchurl {
+      url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+      sha256 = "0mg3pj9bs9xg3sks2mbdyba9x191d88vavkbr3l264fnr4kkn81i";
+    };
+  }));
 
   ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
     pname = "ansible";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0f055a3d916..efefe5d6ca3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9653,7 +9653,9 @@ in
   inherit (callPackage ../tools/admin/ansible { })
     ansible
     ansible_2_6
-    ansible_2_7;
+    ansible_2_7
+    ansible_2_8
+    ansible_2_9;
 
   ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
 

From 3444d76c1b312b40f59b5f472b9be3e379e91512 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 9 Jan 2020 12:02:56 -0800
Subject: [PATCH 427/755] ansible_2_*: overridePythonAttrs -> overrideAttrs

---
 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 197543945c2b..191f73ce58ca 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -15,7 +15,7 @@ rec {
     };
   }));
 
-  ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
+  ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
     pname = "ansible";
     version = "2.7.15";
 
@@ -25,7 +25,7 @@ rec {
     };
   }));
 
-  ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
+  ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
     pname = "ansible";
     version = "2.6.20";
 

From 1474940ea454184936addbe2c7db824dfe302d26 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 9 Jan 2020 13:21:03 -0800
Subject: [PATCH 428/755] ansible_2_8: 2.8.6 -> 2.8.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 191f73ce58ca..7dde0e4764c6 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -7,11 +7,11 @@ rec {
 
   ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
     pname = "ansible";
-    version = "2.8.6";
+    version = "2.8.7";
 
     src = fetchurl {
       url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
-      sha256 = "0mg3pj9bs9xg3sks2mbdyba9x191d88vavkbr3l264fnr4kkn81i";
+      sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2";
     };
   }));
 

From fcb3cf3324a8e7f624e1c9cf128b3aceb726de5f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Dec 2019 09:14:55 -0800
Subject: [PATCH 429/755] python3Packages.dask-ml: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index 06c5f1753d47..c5fafa495aa6 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -20,13 +20,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.1";
+  version = "1.2.0";
   pname = "dask-ml";
   disabled = pythonOlder "3.6"; # >= 3.6
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yad9b9hd02rbdf6m1gfj74cjgcbyp7lxdj22d5h5rhv7xa3127x";
+    sha256 = "0ppg8licvkxz1af2q87cxms2p6ss2r5d4fdkbcivph56r0v0ci2k";
   };
 
   propagatedBuildInputs = [

From 228425978d20381350b53b2f3140ff4014c13f13 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Sun, 19 Jan 2020 11:18:47 -0500
Subject: [PATCH 430/755] corerad: 0.1.8 -> 0.1.9

---
 pkgs/tools/networking/corerad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index c5cbd8c21f52..e8f174506882 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "corerad";
-  version = "0.1.8";
+  version = "0.1.9";
 
   goPackagePath = "github.com/mdlayher/corerad";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "mdlayher";
     repo = "corerad";
     rev = "v${version}";
-    sha256 = "13js6p3svx2xp20yjpb5w71rnyrhiiqbbvsck45i756j1lndaqxr";
+    sha256 = "1m23f318qr6b8c7hxrhihrm09pmdwab988k3bn4ygfm49z5phy4s";
   };
 
-  modSha256 = "03x7r392bwchmd3jzwwykdfkr9lfdn77phfwh8xfk2avhzq7qs89";
+  modSha256 = "0idlpkn6krs77akn3p6gxsbc8zpj1rnjkhhwmb8ns98x82g6bln0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/mdlayher/corerad";

From 50c661c4476c96dfa5cd1ca8843ee16b4b1111aa Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Sun, 19 Jan 2020 11:27:11 -0500
Subject: [PATCH 431/755] nixos/corerad: update test for new configuration

---
 nixos/tests/corerad.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix
index 68b698857b4e..950c9abc8994 100644
--- a/nixos/tests/corerad.nix
+++ b/nixos/tests/corerad.nix
@@ -18,8 +18,7 @@ import ./make-test-python.nix (
               [[interfaces]]
               name = "eth1"
               send_advertisements = true
-                [[interfaces.plugins]]
-                name = "prefix"
+                [[interfaces.prefix]]
                 prefix = "::/64"
             '';
           };

From c4f58aba477b67b22c009ec53857db82e25f7df9 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 22 Jan 2020 10:23:01 +0100
Subject: [PATCH 432/755] hplip: Fix plugin url and hash

---
 pkgs/misc/drivers/hplip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index a7e080ebce29..1514e8def970 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -20,8 +20,8 @@ let
   };
 
   plugin = fetchurl {
-    url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1b5gys04kh41gg7r7rzlpdbc2f4jirl2ik22cd935mm85k7abfwq";
+    url = "https://developers.hp.com/sites/default/files/${name}-plugin.run";
+    sha256 = "1fn8h1a5znjqjh071ifjdywr0xswc14286gwy6h9vvlh8hzrz347";
   };
 
   hplipState = substituteAll {

From cc7267143bb8af01628dce9d30e2952adc092512 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 09:47:39 +0000
Subject: [PATCH 433/755] pdsh: 2.33 -> 2.34

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

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index f5c74cfb511f..68aa356261ab 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, readline, rsh, ssh }:
 
 stdenv.mkDerivation rec {
-  name = "pdsh-2.33";
+  name = "pdsh-2.34";
 
   src = fetchurl {
     url = "https://github.com/chaos/pdsh/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k";
+    sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl";
   };
 
   buildInputs = [ perl readline ssh ];

From 546fe02875de012f3a0adae465c4e8da6dad6c9f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 22 Jan 2020 09:49:54 +0000
Subject: [PATCH 434/755] h: init at 1.0.0 (#78017)

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 pkgs/tools/misc/h/default.nix   | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/h/default.nix

diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix
new file mode 100644
index 000000000000..f4897a54cb13
--- /dev/null
+++ b/pkgs/tools/misc/h/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, makeWrapper, ruby }:
+
+stdenv.mkDerivation rec {
+  pname = "h";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "zimbatm";
+    repo = "h";
+    rev = "v${version}";
+    hash = "sha256-chGrMtvLyyNtlM7PO1olVdkzkvMOk6OibHw+mqwVxIM=";
+  };
+
+  buildInputs = [ ruby ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp h $out/bin/h
+    cp up $out/bin/up
+  '';
+
+  meta = with stdenv.lib; {
+    description = "faster shell navigation of projects";
+    homepage = "https://github.com/zimbatm/h";
+    license = licenses.mit;
+    maintainers = [ maintainers.zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efefe5d6ca3d..06fb92807231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1593,6 +1593,8 @@ in
 
   direnv = callPackage ../tools/misc/direnv { };
 
+  h = callPackage ../tools/misc/h { };
+
   discount = callPackage ../tools/text/discount { };
 
   diskscan = callPackage ../tools/misc/diskscan { };

From fff7a7a8620c195cfbac227e33d1c1263ba38dee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 10:12:28 +0000
Subject: [PATCH 435/755] picard-tools: 2.21.3 -> 2.21.6

---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index a67653c84373..44247f294aa6 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.21.3";
+  version = "2.21.6";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns";
+    sha256 = "1vpyzhrs3bbviwk2n7k5296rnsw7g9ksvjsibl0gm7dawip9jb5s";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c9c3b9d602909b87938f8a0ca105979bdf1f217c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 10:15:38 +0000
Subject: [PATCH 436/755] plantuml: 1.2019.13 -> 1.2020.0

---
 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 ec56bb2b6684..b42be5b548cd 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.2019.13";
+  version = "1.2020.0";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "0r8ahcnim7is7np68ci6ppzr07iyx417wi81gkckfyy5p4pwk8kz";
+    sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 593e11fd944ce961ecf5425c3540df09e4f52265 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 22 Jan 2020 11:26:22 +0100
Subject: [PATCH 437/755] treewide: fix redirected urls

According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
---
 nixos/lib/testing/jquery-ui.nix                           | 4 ++--
 nixos/modules/services/amqp/rabbitmq.nix                  | 8 ++++----
 pkgs/applications/audio/sonic-visualiser/default.nix      | 2 +-
 pkgs/applications/audio/vcv-rack/default.nix              | 2 +-
 pkgs/applications/audio/vkeybd/default.nix                | 2 +-
 pkgs/applications/blockchains/wownero.nix                 | 2 +-
 pkgs/applications/editors/emacs-modes/org-generated.nix   | 4 ++--
 .../editors/emacs-modes/org-mac-link/default.nix          | 2 +-
 .../graphics/rapid-photo-downloader/default.nix           | 2 +-
 pkgs/applications/graphics/shutter/default.nix            | 2 +-
 pkgs/applications/misc/loxodo/default.nix                 | 2 +-
 pkgs/applications/misc/slic3r/default.nix                 | 2 +-
 .../networking/instant-messengers/teamspeak/client.nix    | 2 +-
 pkgs/applications/networking/irc/wraith/default.nix       | 2 +-
 pkgs/applications/networking/sync/unison/default.nix      | 2 +-
 pkgs/applications/office/zim/default.nix                  | 2 +-
 pkgs/applications/science/biology/poretools/default.nix   | 2 +-
 .../applications/science/robotics/apmplanner2/default.nix | 2 +-
 .../version-management/git-and-tools/subgit/default.nix   | 2 +-
 pkgs/applications/version-management/redmine/default.nix  | 2 +-
 .../version-management/smartgithg/default.nix             | 2 +-
 pkgs/applications/video/simplescreenrecorder/default.nix  | 2 +-
 pkgs/data/fonts/ttf-envy-code-r/default.nix               | 2 +-
 .../fonts/ultimate-oldschool-pc-font-pack/default.nix     | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix    | 2 +-
 pkgs/development/compilers/souffle/default.nix            | 2 +-
 pkgs/development/interpreters/racket/default.nix          | 2 +-
 pkgs/development/libraries/audio/lv2/default.nix          | 2 +-
 pkgs/development/libraries/box2d/default.nix              | 2 +-
 pkgs/development/libraries/levmar/default.nix             | 4 ++--
 pkgs/development/libraries/libxl/default.nix              | 4 ++--
 .../libraries/rabbitmq-java-client/default.nix            | 2 +-
 pkgs/development/libraries/rlog/default.nix               | 2 +-
 pkgs/development/libraries/safefile/default.nix           | 2 +-
 pkgs/development/libraries/shhmsg/default.nix             | 4 ++--
 pkgs/development/libraries/shhopt/default.nix             | 4 ++--
 pkgs/development/libraries/szip/default.nix               | 2 +-
 pkgs/development/libraries/tokyo-tyrant/default.nix       | 4 ++--
 pkgs/development/libraries/wcslib/default.nix             | 2 +-
 pkgs/development/libraries/zimlib/default.nix             | 2 +-
 pkgs/development/lua-modules/generated-packages.nix       | 4 ++--
 pkgs/development/python-modules/cjson/default.nix         | 2 +-
 pkgs/development/python-modules/eventlib/default.nix      | 2 +-
 pkgs/development/python-modules/pymatgen/default.nix      | 2 +-
 pkgs/development/python-modules/pysqlite/default.nix      | 2 +-
 pkgs/development/python-modules/sipsimple/default.nix     | 2 +-
 .../development/python-modules/stringtemplate/default.nix | 4 ++--
 pkgs/development/python-modules/textacy/default.nix       | 2 +-
 pkgs/development/python-modules/umap-learn/default.nix    | 2 +-
 pkgs/development/python-modules/uvloop/default.nix        | 2 +-
 pkgs/development/python-modules/venusian/default.nix      | 2 +-
 pkgs/development/python-modules/web/default.nix           | 2 +-
 .../python-modules/xstatic-jquery-ui/default.nix          | 2 +-
 pkgs/development/tools/database/sqlitebrowser/default.nix | 2 +-
 pkgs/development/tools/devtodo/default.nix                | 2 +-
 pkgs/development/tools/misc/saleae-logic/default.nix      | 2 +-
 pkgs/development/tools/misc/watson-ruby/default.nix       | 2 +-
 pkgs/games/snake4/default.nix                             | 4 ++--
 pkgs/games/spring/springlobby.nix                         | 2 +-
 pkgs/games/stepmania/default.nix                          | 2 +-
 pkgs/games/tdm/default.nix                                | 2 +-
 pkgs/games/zandronum/default.nix                          | 2 +-
 pkgs/misc/drivers/sundtek/default.nix                     | 2 +-
 pkgs/os-specific/linux/trace-cmd/default.nix              | 2 +-
 pkgs/servers/amqp/rabbitmq-server/default.nix             | 2 +-
 pkgs/servers/http/spawn-fcgi/default.nix                  | 2 +-
 pkgs/servers/search/groonga/default.nix                   | 2 +-
 pkgs/shells/tcsh/default.nix                              | 2 +-
 pkgs/shells/xonsh/default.nix                             | 2 +-
 pkgs/tools/archivers/unrar/default.nix                    | 2 +-
 pkgs/tools/backup/rsnapshot/default.nix                   | 4 ++--
 pkgs/tools/filesystems/yandex-disk/default.nix            | 2 +-
 pkgs/tools/misc/gnuvd/default.nix                         | 2 +-
 pkgs/tools/misc/ipxe/default.nix                          | 2 +-
 pkgs/tools/misc/x11idle/default.nix                       | 2 +-
 pkgs/tools/networking/stunnel/default.nix                 | 2 +-
 pkgs/tools/networking/uwimap/default.nix                  | 2 +-
 77 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/nixos/lib/testing/jquery-ui.nix b/nixos/lib/testing/jquery-ui.nix
index e65107a3c2fb..abd59da2d285 100644
--- a/nixos/lib/testing/jquery-ui.nix
+++ b/nixos/lib/testing/jquery-ui.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jquery-ui-1.11.4";
 
   src = fetchurl {
-    url = "http://jqueryui.com/resources/download/${name}.zip";
+    url = "https://jqueryui.com/resources/download/${name}.zip";
     sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://jqueryui.com/;
+    homepage = https://jqueryui.com/;
     description = "A library of JavaScript widgets and effects";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 35fb49f709a6..f80d6b3f1ba5 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -98,8 +98,8 @@ in {
           will be merged into these options by RabbitMQ at runtime to
           form the final configuration.
 
-          See http://www.rabbitmq.com/configure.html#config-items
-          For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
+          See https://www.rabbitmq.com/configure.html#config-items
+          For the distinct formats, see https://www.rabbitmq.com/configure.html#config-file-formats
         '';
       };
 
@@ -116,8 +116,8 @@ in {
           The contents of this option will be merged into the <literal>configItems</literal>
           by RabbitMQ at runtime to form the final configuration.
 
-          See the second table on http://www.rabbitmq.com/configure.html#config-items
-          For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
+          See the second table on https://www.rabbitmq.com/configure.html#config-items
+          For the distinct formats, see https://www.rabbitmq.com/configure.html#config-file-formats
         '';
       };
 
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 501d097f29fa..6164c1cfe933 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "View and analyse contents of music audio files";
-    homepage = http://www.sonicvisualiser.org/;
+    homepage = https://www.sonicvisualiser.org/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu maintainers.marcweber ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 11daabbf8104..21aa27fa5bc1 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -93,7 +93,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-source virtual modular synthesizer";
-    homepage = http://vcvrack.com/;
+    homepage = https://vcvrack.com/;
     # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
     # no-derivatives clause
     license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index 485edaa1ff27..3f77a6574724 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "Virtual MIDI keyboard";
-    homepage = http://www.alsa-project.org/~tiwai/alsa.html;
+    homepage = https://www.alsa-project.org/~tiwai/alsa.html;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix
index 8b25e098b2fe..eb813a361251 100644
--- a/pkgs/applications/blockchains/wownero.nix
+++ b/pkgs/applications/blockchains/wownero.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       signatures using different participants for the same tx outputs on
       opposing forks.
     '';
-    homepage    = http://wownero.org/;
+    homepage    = https://wownero.org/;
     license     = licenses.bsd3;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ fuwa ];
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 8d70794a7540..302f5adcfb1f 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -6,7 +6,7 @@
         ename = "org";
         version = "20191203";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20191203.tar";
+          url = "https://orgmode.org/elpa/org-20191203.tar";
           sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q";
         };
         packageRequires = [];
@@ -21,7 +21,7 @@
         ename = "org-plus-contrib";
         version = "20191203";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20191203.tar";
+          url = "https://orgmode.org/elpa/org-plus-contrib-20191203.tar";
           sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah";
         };
         packageRequires = [];
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index 241ec3b42c9e..4d8f40074bdd 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Insert org-mode links to items selected in various Mac apps";
-    homepage = http://orgmode.org/worg/org-contrib/org-mac-link.html;
+    homepage = https://orgmode.org/worg/org-contrib/org-mac-link.html;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 2e12e18a5a53..ed8ef35a7e57 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -80,7 +80,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Photo and video importer for cameras, phones, and memory cards";
-    homepage = http://www.damonlynch.net/rapid/;
+    homepage = https://www.damonlynch.net/rapid/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jfrankenau ];
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 957692b4ba17..dd41ee4c3f84 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Screenshot and annotation tool";
-    homepage = http://shutter-project.org/;
+    homepage = https://shutter-project.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index f84ac6d600a6..846df292eb1a 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -30,7 +30,7 @@ py.buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "A Password Safe V3 compatible password vault";
-    homepage = http://www.christoph-sommer.de/loxodo/;
+    homepage = https://www.christoph-sommer.de/loxodo/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 8dbd0cd57767..1465b0ea0523 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       instructions for your 3D printer. It cuts the model into horizontal
       slices (layers), generates toolpaths to fill them and calculates the
       amount of material to be extruded.'';
-    homepage = http://slic3r.org/;
+    homepage = https://slic3r.org/;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor the-kenny ];
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index a75d0c8633a2..c2a9f4be90a2 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The TeamSpeak voice communication tool";
-    homepage = http://teamspeak.com/;
+    homepage = https://teamspeak.com/;
     license = {
       fullName = "Teamspeak client license";
       url = http://sales.teamspeakusa.com/licensing.php;
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
index 6d9acdb68e52..996ab72d6f5d 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
       The binary will not run when moved onto non-NixOS systems; use patchelf
       to fix its runtime dependenices.
     '';
-    homepage = http://wraith.botpack.net/;
+    homepage = https://wraith.botpack.net/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ elitak ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index bc93b743f8b1..cada3f93f55a 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (rec {
   dontStrip = !ocaml.nativeCompilers;
 
   meta = {
-    homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
+    homepage = https://www.cis.upenn.edu/~bcpierce/unison/;
     description = "Bidirectional file synchronizer";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index baf7741ed222..a9b0f526852d 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   version = "0.72.0";
 
   src = fetchurl {
-    url = "http://zim-wiki.org/downloads/${name}.tar.gz";
+    url = "https://zim-wiki.org/downloads/${name}.tar.gz";
     sha256 = "1n3gmg7g86s8iwcx0i7rvvfdfs1fzmc9awr9qzjd2rckw4bkxad1";
   };
 
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 8a19ae135e87..4660a776ab21 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec {
   meta = {
     description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore";
     license = stdenv.lib.licenses.mit;
-    homepage = http://poretools.readthedocs.io/en/latest/;
+    homepage = https://poretools.readthedocs.io/en/latest/;
     maintainers = [stdenv.lib.maintainers.rybern];
   };
 }
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index fe5f8790f38f..0bc58c50335a 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -46,7 +46,7 @@ mkDerivation rec {
       A GUI ground control station for autonomous vehicles using the MAVLink protocol.
       Includes support for the APM and PX4 based controllers.
     '';
-    homepage = http://ardupilot.org/planner2/;
+    homepage = https://ardupilot.org/planner2/;
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ wucke13 ];
   };
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index 3636ad11fb6e..ac11e7469e50 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://subgit.com/download/${name}.zip";
+    url = "https://subgit.com/download/${name}.zip";
     sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
   };
 }
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index e25cde11af06..a133a9a6a2a9 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -36,7 +36,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://www.redmine.org/;
+      homepage = https://www.redmine.org/;
       platforms = platforms.linux;
       maintainers = [ maintainers.aanderse ];
       license = licenses.gpl2;
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 554dbae3882e..df55f20783fa 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GUI for Git, Mercurial, Subversion";
-    homepage = http://www.syntevo.com/smartgit/;
+    homepage = https://www.syntevo.com/smartgit/;
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 6191fd0f18ad..b06f0fcd962e 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A screen recorder for Linux";
-    homepage = http://www.maartenbaert.be/simplescreenrecorder;
+    homepage = https://www.maartenbaert.be/simplescreenrecorder;
     license = licenses.gpl3;
     platforms = [ "x86_64-linux" ];
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 024e1acd4345..0f670f106fd0 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -17,7 +17,7 @@ in fetchzip {
   sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z";
 
   meta = with lib; {
-    homepage = http://damieng.com/blog/tag/envy-code-r;
+    homepage = https://damieng.com/blog/tag/envy-code-r;
     description = "Free scalable coding font by DamienG";
     license = licenses.unfree;
     maintainers = [ maintainers.lyt ];
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index f9045794fe15..5b07adf822e6 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -5,7 +5,7 @@ let
 in
 fetchzip {
   name = "ultimate-oldschool-pc-font-pack-${version}";
-  url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
+  url = "https://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
   sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
 
   postFetch= ''
@@ -15,7 +15,7 @@ fetchzip {
 
   meta = with lib; {
     description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)";
-    homepage = "http://int10h.org/oldschool-pc-fonts/";
+    homepage = "https://int10h.org/oldschool-pc-fonts/";
     license = licenses.cc-by-sa-40;
     maintainers = [ maintainers.endgame ];
   };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 0b31bac8d54b..3abeb74a4355 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Dictionary plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
-    broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin
+    broken = true; # see https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin
   };
 }
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 35ee7de7a2dc..00d1a2f79600 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
-    homepage    = "http://souffle-lang.github.io/";
+    homepage    = "https://souffle-lang.github.io/";
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice copumpkin wchresta ];
     license     = licenses.upl;
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 3b3b91afd6f0..f12d1f1090fb 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
       libraries support applications from web servers and databases to
       GUIs and charts.
     '';
-    homepage = http://racket-lang.org/;
+    homepage = https://racket-lang.org/;
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ kkallio henrytill vrthra ];
     platforms = [ "x86_64-darwin" "x86_64-linux" ];
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index ad450b53d12f..0f86cd76e2a7 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.16.0";
 
   src = fetchurl {
-    url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2";
+    url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
     sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
   };
 
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index d4b4c33f35b5..64b18f389acc 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "2D physics engine";
-    homepage = http://box2d.org/;
+    homepage = https://box2d.org/;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index b814f077f308..9a933b176d34 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "levmar-2.6";
 
   src = fetchurl {
-    url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz";
+    url = "https://www.ics.forth.gr/~lourakis/levmar/${name}.tgz";
     sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
-    homepage = http://www.ics.forth.gr/~lourakis/levmar/;
+    homepage = https://www.ics.forth.gr/~lourakis/levmar/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 23855f6cc7eb..6f11d4c461f9 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.8.8";
 
   src = fetchurl {
-    url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
+    url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
     sha256 = "08jarfcl8l5mrmkx6bcifi3ghkaja9isz77zgggl84yl66js5pc3";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library for parsing Excel files";
-    homepage    = "http://www.libxl.com/";
+    homepage    = "https://www.libxl.com/";
     license     = licenses.unfree;
     platforms   = platforms.linux;
     maintainers = with maintainers; [  ];
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index afb4e0daeb66..ff8db94288a4 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
-    homepage = http://www.rabbitmq.com/java-client.html;
+    homepage = https://www.rabbitmq.com/java-client.html;
     license = with licenses; [ mpl11 gpl2 ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
index f8268b5eb7cd..f9188e1294bc 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = http://www.arg0.net/rlog;
+    homepage = https://www.arg0.net/rlog;
     description = "A C++ logging library used in encfs";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl3;
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index 5136bac2de05..ae5ec222c23c 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://research.cs.wisc.edu/mist/safefile/;
+    homepage = https://research.cs.wisc.edu/mist/safefile/;
     updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix
index 596ea1cfaf88..2790e181ac1b 100644
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/pkgs/development/libraries/shhmsg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "shhmsg-1.4.2";
 
   src = fetchurl {
-    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz";
     sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
   };
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library for displaying messages";
-    homepage = http://shh.thathost.com/pub-unix/;
+    homepage = https://shh.thathost.com/pub-unix/;
     license = licenses.artistic1;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
index 985ee59348b1..52ba959b615e 100644
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "shhopt-1.1.7";
 
   src = fetchurl {
-    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz";
     sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
   };
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library for parsing command line options";
-    homepage = http://shh.thathost.com/pub-unix/;
+    homepage = https://shh.thathost.com/pub-unix/;
     license = licenses.artistic1;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 6fd1d1ca941d..f6d4df2eab3e 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Compression library that can be used with the hdf5 library";
-    homepage = http://www.hdfgroup.org/doc_resource/SZIP/;
+    homepage = https://www.hdfgroup.org/doc_resource/SZIP/;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index 7bf08a3560ae..358da431e1c7 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "tokyotyrant-1.1.41";
 
   src = fetchurl {
-    url = "http://fallabs.com/tokyotyrant/${name}.tar.gz";
+    url = "https://fallabs.com/tokyotyrant/${name}.tar.gz";
     sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
          licensed under the GNU Lesser General Public License.
        '';
 
-    homepage = http://fallabs.com/tokyotyrant/;
+    homepage = https://fallabs.com/tokyotyrant/;
 
     license = stdenv.lib.licenses.lgpl21Plus;
 
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index b0c8c1edd66b..aa4ceb461f1f 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "World Coordinate System Library for Astronomy";
-    homepage = http://www.atnf.csiro.au/people/mcalabre/WCS/;
+    homepage = https://www.atnf.csiro.au/people/mcalabre/WCS/;
 
     longDescription = ''Library for world coordinate systems for
     spherical geometries and their conversion to image coordinate
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 1b74b8c5388b..34a03e56a102 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing ZIM files";
-    homepage =  http://www.openzim.org/wiki/Zimlib;
+    homepage =  https://www.openzim.org/wiki/Zimlib;
     license = licenses.gpl2;
     maintainers = with maintainers; [ robbinch ];
     platforms = platforms.linux;
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4cff22a8d41c..668ad3a0bbd7 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1173,7 +1173,7 @@ luautf8 = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/starwing/luautf8";
+    homepage = "https://github.com/starwing/luautf8";
     description = "A UTF-8 support module for Lua";
     maintainers = with maintainers; [ pstn ];
     license = {
@@ -1212,7 +1212,7 @@ lua-yajl = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/brimworks/lua-yajl";
+    homepage = "https://github.com/brimworks/lua-yajl";
     description = "Integrate the yajl JSON library with Lua.";
     maintainers = with maintainers; [ pstn ];
     license = {
diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix
index 2042a2d629bb..c9b5be5e6048 100644
--- a/pkgs/development/python-modules/cjson/default.nix
+++ b/pkgs/development/python-modules/cjson/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A very fast JSON encoder/decoder for Python";
-    homepage = http://ag-projects.com/;
+    homepage = https://ag-projects.com/;
     license = licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
index 837ffa0d86d7..4f684612f184 100644
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ b/pkgs/development/python-modules/eventlib/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Eventlib bindings for python";
-    homepage    = "http://ag-projects.com/";
+    homepage    = "https://ag-projects.com/";
     license     = licenses.lgpl2;
   };
 
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index ecc35d357360..4f99d0021e0e 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A robust materials analysis code that defines core object representations for structures and molecules";
-    homepage = http://pymatgen.org/;
+    homepage = https://pymatgen.org/;
     license = licenses.mit;
     maintainers = with maintainers; [ psyanticy ];
   };
diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix
index c1118aeeecd7..b13cd1781d28 100644
--- a/pkgs/development/python-modules/pysqlite/default.nix
+++ b/pkgs/development/python-modules/pysqlite/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://pysqlite.org/;
+    homepage = https://pysqlite.org/;
     description = "Python bindings for the SQLite embedded relational database engine";
     longDescription = ''
       pysqlite is a DB-API 2.0-compliant database interface for SQLite.
diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix
index 7839a77f9f5e..63425d2b8bde 100644
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/pkgs/development/python-modules/sipsimple/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "SIP SIMPLE implementation for Python";
-    homepage = http://sipsimpleclient.org/;
+    homepage = https://sipsimpleclient.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
   };
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index 3d2b2337be4c..7326f7d48e1b 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
   version = "3.2b1";
 
   src = fetchurl {
-    url = "http://www.stringtemplate.org/download/${pname}-${version}.tar.gz";
+    url = "https://www.stringtemplate.org/download/${pname}-${version}.tar.gz";
     sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
   };
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = http://www.stringtemplate.org/;
+    homepage = https://www.stringtemplate.org/;
     description = "Text Templating Library";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 454cff5e4a87..9d44ce98898e 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Higher-level text processing, built on spaCy";
-    homepage = "http://textacy.readthedocs.io/";
+    homepage = "https://textacy.readthedocs.io/";
     license = licenses.asl20;
     maintainers = with maintainers; [ rvl ];
   };
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index a97f69652e8e..465c02beb4f4 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -42,7 +42,7 @@ def test_umap_transform_on_iris()"
 
   meta = with lib; {
     description = "Uniform Manifold Approximation and Projection";
-    homepage = http://github.com/lmcinnes/umap;
+    homepage = https://github.com/lmcinnes/umap;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index b1fbf26e43b1..90c8a4901c54 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Fast implementation of asyncio event loop on top of libuv";
-    homepage = http://github.com/MagicStack/uvloop;
+    homepage = https://github.com/MagicStack/uvloop;
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
   };
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index fb81a79f10e3..7a67fdf727b3 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A library for deferring decorator actions";
-    homepage = http://pylonsproject.org/;
+    homepage = https://pylonsproject.org/;
     license = licenses.bsd0;
     maintainers = with maintainers; [ domenkozar ];
   };
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index c6a25c7d1b77..ea1ffc7826fb 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
       Think about the ideal way to write a web app.
       Write the code to make it happen.
     '';
-    homepage = "http://webpy.org/";
+    homepage = "https://webpy.org/";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ layus ];
   };
diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
index 3424c8fcf6f2..c47dfbc05d85 100644
--- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ xstatic-jquery ];
 
   meta = with lib;{
-    homepage = http://jqueryui.com/;
+    homepage = https://jqueryui.com/;
     description = "jquery-ui packaged static files for python";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 0ec4b1510e91..3a4425d436a6 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "DB Browser for SQLite";
-    homepage = http://sqlitebrowser.org/;
+    homepage = https://sqlitebrowser.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [  ];
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index b3134b0d0ad0..4396f2953405 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://swapoff.org/devtodo1.html;
+    homepage = https://swapoff.org/devtodo1.html;
     description = "A hierarchical command-line task manager";
     license = licenses.gpl2;
     maintainers = [ maintainers.woffs ];
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 0519e4d05e04..ffb537abfbaa 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Software for Saleae logic analyzers";
-    homepage = http://www.saleae.com/;
+    homepage = https://www.saleae.com/;
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index 64e04455abe6..4d73e106b2f5 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An inline issue manager";
-    homepage    = http://goosecode.com/watson/;
+    homepage    = https://goosecode.com/watson/;
     license     = with licenses; mit;
     maintainers = with maintainers; [ robertodr nicknovitski ];
     platforms   = platforms.unix;
diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix
index f37e15a22dfe..b3a74d0f4fbe 100644
--- a/pkgs/games/snake4/default.nix
+++ b/pkgs/games/snake4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "snake4-1.0.14";
 
   src = fetchurl {
-    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz";
     sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A game starring a fruit-eating snake";
-    homepage = http://shh.thathost.com/pub-unix/html/snake4.html;
+    homepage = https://shh.thathost.com/pub-unix/html/snake4.html;
     license = licenses.artistic1;
     platforms = platforms.linux;
   };
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index b7c9b691c043..dbcec10fdc65 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://springlobby.info/;
+    homepage = https://springlobby.info/;
     repositories.git = git://github.com/springlobby/springlobby.git;
     description = "Cross-platform lobby client for the Spring RTS project";
     license = licenses.gpl2;
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index b29d22dfe736..71524c244eea 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = http://www.stepmania.com/;
+    homepage = https://www.stepmania.com/;
     description = "Free dance and rhythm game for Windows, Mac, and Linux";
     platforms = platforms.linux;
     license = licenses.mit; # expat version
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix
index 949f5a3e2ab9..294d4703bb05 100644
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@@ -20,7 +20,7 @@ let
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
   src = fetchurl {
-    url = "http://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
+    url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
     sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6";
   };
   nativeBuildInputs = [
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index 754c48149454..3f1ebb696188 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://zandronum.com/;
+    homepage = https://zandronum.com/;
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
     maintainers = with maintainers; [ lassulus MP2E ];
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index be199936426c..5b1641a098df 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -46,6 +46,6 @@ in
       maintainers = [ maintainers.simonvandel ];
       platforms = platforms.unix;
       license = licenses.unfree;
-      homepage = http://support.sundtek.com/index.php/topic,1573.0.html;
+      homepage = https://support.sundtek.com/index.php/topic,1573.0.html;
     };
   }
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 47adcf938c5b..5ec5fbb7c229 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "User-space tools for the Linux kernel ftrace subsystem";
-    homepage    = http://kernelshark.org/;
+    homepage    = https://kernelshark.org/;
     license     = licenses.gpl2;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ thoughtpolice basvandijk ];
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 868fd3a6d561..8fd207e9175c 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.rabbitmq.com/;
+    homepage = https://www.rabbitmq.com/;
     description = "An implementation of the AMQP messaging protocol";
     license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index d118e8af66d4..c24b0b4c1a94 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = "http://redmine.lighttpd.net/projects/spawn-fcgi";
+    homepage    = "https://redmine.lighttpd.net/projects/spawn-fcgi";
     description = "Provides an interface to external programs that support the FastCGI interface";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index cfadeac5f076..26fd392943c5 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   installCheckPhase = "$out/bin/groonga --version";
 
   meta = with stdenv.lib; {
-    homepage    = http://groonga.org/;
+    homepage    = https://groonga.org/;
     description = "An open-source fulltext search engine and column store";
     license     = licenses.lgpl21;
     maintainers = [ maintainers.ericsagnes ];
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index f13919e52e7c..110beb828042 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       - history mechanism
       - job control
     '';
-    homepage = http://www.tcsh.org/;
+    homepage = https://www.tcsh.org/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 58dd629929ff..0e2490ff4341 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
-    homepage = http://xon.sh/;
+    homepage = https://xon.sh/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt vrthra ];
     platforms = platforms.all;
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 0fe8f2f58665..cf05e326aff2 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utility for RAR archives";
-    homepage = http://www.rarlab.com/;
+    homepage = https://www.rarlab.com/;
     license = licenses.unfreeRedistributable;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.all;
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 9f6204db2d8f..eebdcf7ba915 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "rsnapshot-1.4.3";
 
   src = fetchurl {
-    url = "http://rsnapshot.org/downloads/${name}.tar.gz";
+    url = "https://rsnapshot.org/downloads/${name}.tar.gz";
     sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A filesystem snapshot utility for making backups of local and remote systems";
-    homepage = http://rsnapshot.org/;
+    homepage = https://rsnapshot.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 041d9a4e3f8b..b97480d655b4 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://help.yandex.com/disk/cli-clients.xml;
+    homepage = https://help.yandex.com/disk/cli-clients.xml;
     description = "A free cloud file storage service";
     maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ];
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix
index 9369c31fdeb5..4da5ec2e5d5f 100644
--- a/pkgs/tools/misc/gnuvd/default.nix
+++ b/pkgs/tools/misc/gnuvd/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Command-line dutch dictionary application";
-    homepage = http://www.djcbsoftware.nl/code/gnuvd/;
+    homepage = https://www.djcbsoftware.nl/code/gnuvd/;
     license = licenses.gpl2;
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 219c03f263c7..010a5b0aae02 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib;
     { description = "Network boot firmware";
-      homepage = http://ipxe.org/;
+      homepage = https://ipxe.org/;
       license = licenses.gpl2;
       maintainers = with maintainers; [ ehmry ];
       platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix
index f4a397ed9ddc..270b39f8110b 100644
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/pkgs/tools/misc/x11idle/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     longDescription = ''
       Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard.
     '';
-    homepage = http://orgmode.org/;
+    homepage = https://orgmode.org/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.swflint ];
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index b9278dd7c0d5..eaa05bfdbad6 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Universal tls/ssl wrapper";
-    homepage    = "http://www.stunnel.org/";
+    homepage    = "https://www.stunnel.org/";
     license     = stdenv.lib.licenses.gpl2Plus;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index b687f1db0170..4a8dab9366f6 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation ({
   '';
 
   meta = {
-    homepage = http://www.washington.edu/imap/;
+    homepage = https://www.washington.edu/imap/;
     description = "UW IMAP toolkit - IMAP-supporting software developed by the UW";
     license = stdenv.lib.licenses.asl20;
     platforms = with stdenv.lib.platforms; linux;

From 87e0a8a1392d4c6b4a2e6048c2853b3c480df777 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 10:53:54 +0000
Subject: [PATCH 438/755] powerstat: 0.02.20 -> 0.02.21

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

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 7f5b14ca72fd..91e1bc0f53a2 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "powerstat";
-  version = "0.02.20";
+  version = "0.02.21";
   
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1qsxk055pfjqnd9w4nx6js7a8bzvq6nfjiwjs4h9ik6jlsrhb4v7";
+    sha256 = "00396dyn3mw3virx9h2g9kzw9ai10x7wpn8zclnvvidn9g0jhf31";
   };
   
   installFlags = [ "DESTDIR=${placeholder "out"}" ];

From 208e761fb056aca3e17db174a013d10c787b70d1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 22 Jan 2020 12:20:37 +0100
Subject: [PATCH 439/755] =?UTF-8?q?babl:=200.1.72=20=E2=86=92=200.1.74?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_74/NEWS#L6-7
---
 pkgs/development/libraries/babl/default.nix      | 10 ++--------
 pkgs/development/libraries/babl/fix-darwin.patch | 16 ----------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/babl/fix-darwin.patch

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index c4b1d36ce701..5a579a0505b0 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -9,21 +9,15 @@
 
 stdenv.mkDerivation rec {
   pname = "babl";
-  version = "0.1.72";
+  version = "0.1.74";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
+    sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs";
   };
 
-  patches = [
-    # Apple linker does not know --version-script flag
-    # https://gitlab.gnome.org/GNOME/babl/merge_requests/26
-    ./fix-darwin.patch
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch
deleted file mode 100644
index eaeff63689fc..000000000000
--- a/pkgs/development/libraries/babl/fix-darwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/babl/meson.build b/babl/meson.build
-index b551c9a..f452435 100644
---- a/babl/meson.build
-+++ b/babl/meson.build
-@@ -24,9 +24,9 @@
- ]
- 
- # Linker arguments
--babl_link_args = [
-+babl_link_args = cc.get_supported_link_arguments([
-   '-Wl,--version-script,' + version_script,
--]
-+])
- if platform_win32
-   babl_link_args += '-Wl,--no-undefined'
- endif

From ee9d4c521d4392e7ee94a4d4426fe21a2a3c6342 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 22 Jan 2020 12:22:28 +0100
Subject: [PATCH 440/755] =?UTF-8?q?gegl=5F0=5F4:=200.4.18=20=E2=86=92=200.?=
 =?UTF-8?q?4.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gegl/blob/GEGL_0_4_20/docs/NEWS.txt#L1-36
---
 pkgs/development/libraries/gegl/4.0.nix | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index b3e8ec2e1780..45f2c96dffe5 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -33,37 +33,17 @@
 
 stdenv.mkDerivation rec {
   pname = "gegl";
-  version = "0.4.18";
+  version = "0.4.20";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9";
+    sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93";
   };
 
   patches = [
-    # Fix arch detection.
-    # https://gitlab.gnome.org/GNOME/gegl/merge_requests/53
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8.patch";
-      sha256 = "0aqdr3y5mr47wq44jnhp97188bvpjlf56zrlmn8aazdf07r2apma";
-    })
-
-    # Fix Darwin build.
-    # https://gitlab.gnome.org/GNOME/gegl/merge_requests/54
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch";
-      sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d";
-    })
-
-    # Fix test timeout. Downstream debian patch.
-    (fetchpatch {
-      url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch";
-      sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly";
-    })
-
     # Remove gegl:simple / backend-file test that times out frequently
     ./patches/no-simple-backend-file-test.patch
   ];

From 585ac580df589acd201ce708f0f978f05ec47023 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Tue, 21 Jan 2020 15:26:20 +0100
Subject: [PATCH 441/755] ceph: Bring back ceph-volume

---
 pkgs/tools/filesystems/ceph/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index f3e985edbff6..aa3622ed057a 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -91,6 +91,7 @@ let
     ps.six
     ps.pyyaml
   ]);
+  sitePackages = ceph-python-env.python.sitePackages;
 
   version = "14.2.6";
 in rec {
@@ -135,7 +136,8 @@ in rec {
 
       # for pybind/rgw to find internal dep
       export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
-      # install target needs to be in PYTHONPATH for "*.pth support" check to succeed
+      # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others
+      export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages}
 
       patchShebangs src/script src/spdk src/test src/tools
     '';
@@ -159,6 +161,10 @@ in rec {
     postFixup = ''
       wrapPythonPrograms
       wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
+
+      # Test that ceph-volume exists since the build system has a tendency to
+      # silently drop it with misconfigurations.
+      test -f $out/bin/ceph-volume
     '';
 
     enableParallelBuilding = true;
@@ -187,11 +193,11 @@ in rec {
         platforms = [ "x86_64-linux" ];
       };
     } ''
-      mkdir -p $out/{bin,etc,lib/python3.7/site-packages}
+      mkdir -p $out/{bin,etc,${sitePackages}}
       cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
       cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
       cp -r ${ceph}/bin/rbd-replay* $out/bin
-      cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/
+      cp -r ${ceph}/${sitePackages} $out/${sitePackages}
       cp -r ${ceph}/etc/bash_completion.d $out/etc
       # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
       substituteInPlace $out/bin/ceph          --replace ${ceph} $out

From 19343de8dd91db534fece20c64660735c5b8b914 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 11:30:28 +0000
Subject: [PATCH 442/755] python37Packages.jupyter_console: 6.0.0 -> 6.1.0

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

diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix
index 9200e004d0c6..42f50c203e3d 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "jupyter_console";
-  version = "6.0.0";
+  version = "6.1.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5";
+    sha256 = "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg";
   };
 
   propagatedBuildInputs = [

From a3f6eb3bf7859a0be647ae91127ea35360aacdee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jan 2020 12:50:24 +0100
Subject: [PATCH 443/755] obs-studio: prefer ffmpeg 4.x over 3.x

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63a930a76862..33390a615819 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20668,7 +20668,7 @@ in
 
   obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
 
-  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
+  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; };
 
   obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
 

From fa4416e9bf3410ed62a40a431404121673d013c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jan 2020 12:51:51 +0100
Subject: [PATCH 444/755] obs-studio: use the official git repository

---
 pkgs/applications/video/obs-studio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 0c103f997b2c..380b3d49ca73 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -40,7 +40,7 @@ in mkDerivation rec {
   version = "24.0.6";
 
   src = fetchFromGitHub {
-    owner = "jp9000";
+    owner = "obsproject";
     repo = "obs-studio";
     rev = version;
     sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh";

From 784ddd9f968af8cc4c1cfdf7a513641cc87668e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 12:07:56 +0000
Subject: [PATCH 445/755] python37Packages.cmd2: 0.9.22 -> 0.9.23

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

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 2dba7e433913..6cc91f4b74cb 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.22";
+  version = "0.9.23";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6";
+    sha256 = "17ic6lxzz9yrwxh3l1skcqgr59c47w5fidj5qmrk1l26rkrjxlca";
   };
 
   LC_ALL="en_US.UTF-8";

From 4dc3337f805f357a5bc11f255f69d9ecb3b8d6d3 Mon Sep 17 00:00:00 2001
From: Alexey Vakhrenev <avakhrenev@gmail.com>
Date: Wed, 22 Jan 2020 13:32:21 +0300
Subject: [PATCH 446/755] openjdk11: 11.0.4 -> 11.0.6

---
 pkgs/development/compilers/openjdk/11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index b8381feef095..2081d3396707 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -10,7 +10,7 @@
 
 let
   major = "11";
-  update = ".0.4";
+  update = ".0.6";
   build = "ga";
 
   openjdk = stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x";
+      sha256 = "1w6n0cnz9izpjb3sc870q7a0jz85a6c7fiszymxin10cnsajkzir";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf ];

From f18f8a063b88d92e70016b59835282b4cb1afd80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 04:06:06 +0000
Subject: [PATCH 447/755] mawk: 1.3.4-20190203 -> 1.3.4-20200106

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

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index fbfc032445b4..81d11e2aae7e 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mawk-1.3.4-20190203";
+  name = "mawk-1.3.4-20200106";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/mawk/${name}.tgz"
       "https://invisible-mirror.net/archives/mawk/${name}.tgz"
     ];
-    sha256 = "0h5qlslaj5czz4v25hqg8a6kg4c5mlkmdpxhhvpvp1ci08ab7b6s";
+    sha256 = "1dhmn0l1c122a4bb07a1lwzrzpjdhsbdbllb1a9gwvv2lw5j9qgi";
   };
 
   meta = with stdenv.lib; {

From 393b3e8746b33f6a822103ad5666bbe57fe53789 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 14:29:47 +0100
Subject: [PATCH 448/755] tdesktop: 1.9.3 -> 1.9.4 (#78274)

---
 .../telegram/tdesktop/default.nix             | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index bec2f7505266..25ee992cb6c8 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -18,30 +18,27 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.3";
+  version = "1.9.4";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1fx7v7j7iw4iywdbl89c5f1y74via61a0k20zrgjv5a0j4v6g76a";
+    sha256 = "1ldsgbix0ca4pl2z55wiz90ll3542zsm9slayrzyr7b2jw7arxwy";
   };
 
   # Arch patches (svn export telegram-desktop/trunk)
   archPatches = fetchsvn {
     url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    rev = "549803";
-    sha256 = "1py2a25wgpvx0n4kz383fj0jav1qdm8wqx5bdaygg6296r294czj";
+    rev = "553350";
+    sha256 = "05fyij490flrbn4jfwhm8gx9imh0wfby4j9fj69f45qgkpsd7ajb";
   };
 
   # Note: It would be best if someone could get as many patches upstream as
   # possible (we currently depend a lot on custom patches...).
   patches = [
-    "${archPatches}/0001-Dynamic-linking-system-libs.patch"
-    "${archPatches}/0002-Dynamic-linking-system-qt.patch"
-    "${archPatches}/0004-gtk3.patch"
     "${archPatches}/0005-Use-system-wide-fonts.patch"
     "${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
   ];
@@ -49,8 +46,6 @@ mkDerivation rec {
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
       --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
-    substituteInPlace cmake/external/ranges/CMakeLists.txt \
-      --replace "/usr/include" "${range-v3}/include"
   '';
 
   # We want to run wrapProgram manually (with additional parameters)
@@ -83,18 +78,35 @@ mkDerivation rec {
   CPPFLAGS = NIX_CFLAGS_COMPILE;
 
   cmakeFlags = [
+    "-Ddisable_autoupdate=ON"
     #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs
     "-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271
     "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
     "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
-    "-DDESKTOP_APP_USE_SYSTEM_LIBS=ON"
+    "-DDESKTOP_APP_USE_PACKAGED=ON"
+    "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
     "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
-    "-Ddisable_autoupdate=ON"
     "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
     "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
+    "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
     #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
   ];
 
+  # Note: The following packages could be packaged system-wide, but it's
+  # probably best to use the bundled ones from tdesktop (Arch does this too):
+  # rlottie:
+  # - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON"
+  # - Sources (problem: there are no stable releases!):
+  #   - desktop-app (tdesktop): https://github.com/desktop-app/rlottie
+  #   - upstream: https://github.com/Samsung/rlottie
+  # libtgvoip:
+  # - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON"
+  # - Sources  (problem: the stable releases might be too old!):
+  #   - tdesktop: https://github.com/telegramdesktop/libtgvoip
+  #   - upstream: https://github.com/grishka/libtgvoip
+  # Both of these packages are included in this PR (kotatogram-desktop):
+  # https://github.com/NixOS/nixpkgs/pull/75210
+
   installPhase = ''
     install -Dm755 bin/Telegram $out/bin/telegram-desktop
 
@@ -115,7 +127,8 @@ mkDerivation rec {
       "''${gappsWrapperArgs[@]}" \
       "''${qtWrapperArgs[@]}" \
       --prefix PATH : ${xdg_utils}/bin \
-      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
+      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
+      --unset QT_QPA_PLATFORMTHEME # From the Arch wrapper
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
   '';

From cb13f8439a0d292831ce8016b73f0ed648ab7956 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 14:05:31 +0100
Subject: [PATCH 449/755] androidStudioPackages.{dev,canary}: 4.0.0.8 ->
 4.0.0.9

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 219c13f241cb..4bea91885795 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0xpcihr5xxr9l1kv6aflywshs8fww3s7di0g98mz475whhxwzf3q";
   };
   latestVersion = { # canary & dev
-    version = "4.0.0.8"; # "Android Studio 4.0 Canary 8"
-    build = "193.6107147";
-    sha256Hash = "0bdibjp52jjlyh0966p9657xxmz1z7vi262v6ss4ywpb7gpaj9qq";
+    version = "4.0.0.9"; # "Android Studio 4.0 Canary 9"
+    build = "193.6137316";
+    sha256Hash = "1cgxyqp85z5x2jnjh1qabn2cfiziiwvfr6iggzb531dlhllyfyqw";
   };
 in {
   # Attributes are named by their corresponding release channels

From b14de67b10e7bf95a42b8a7c8d7c2c9ce1f6bba0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:38:29 +0000
Subject: [PATCH 450/755] python27Packages.apprise: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 6ac9acfac323..38157e136159 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0m0pddqrpfm526f0fyzzjpcp7hi3d6pj0bgk2vl004lkas4li1hw";
+    sha256 = "1j925g7x0j8fzns431360myr8844swb8mb78wacw2vlj6x1c558c";
   };
 
   nativeBuildInputs = [ Babel ];

From 4620668f8527b9e2b18e6935fb0bd34f596e2261 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:26:11 +0000
Subject: [PATCH 451/755] python37Packages.aioresponses: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 13a9e4b546be..446bb9e63791 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.6.1";
+  version = "0.6.2";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fab9607d11a2e05050ef766006b8fdd9424e7122c2bd6f34a5376be4c728e242";
+    sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6";
   };
 
   nativeBuildInputs = [

From ac0226301d1f5f4a1bf045c83ce716264e310776 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:38:31 +0000
Subject: [PATCH 452/755] pyotherside: 1.5.8 -> 1.5.9

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

diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix
index a7f5e03c7380..002208dcc0b0 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/pkgs/development/libraries/pyotherside/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyotherside";
-  version = "1.5.8";
+  version = "1.5.9";
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
     rev = version;
-    sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z";
+    sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8";
   };
 
   nativeBuildInputs = [ qmake ];

From c4d75cbb0c4cfe7311ff056d475e46510ccc88ee Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 17 Jan 2020 10:39:22 +0100
Subject: [PATCH 453/755] =?UTF-8?q?boot.initrd.luks:=20adding=20a=20warnin?=
 =?UTF-8?q?g=20when=20using=20FIDO2=20with=20kernel=20=E2=89=A4=205.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/system/boot/luksroot.nix | 56 ++++++++------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 2253b9251cdc..31f1e22cda32 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   luks = config.boot.initrd.luks;
+  kernelPackages = config.boot.kernelPackages;
 
   commonFunctions = ''
     die() {
@@ -103,33 +104,6 @@ let
         fi
         return 0
     }
-
-    wait_fido2key () {
-        local secs="''${1:-10}"
-
-        fido2luks connected 1>/dev/null 2>&1
-        if [ $? != 0 ]; then
-            echo -n "Waiting $secs seconds for the FIDO2 key to appear..."
-            local success=false
-            for try in $(seq $secs); do
-                echo -n .
-                sleep 1
-                fido2luks connected 1>/dev/null 2>&1
-                if [ $? == 0 ]; then
-                    success=true
-                    break
-                fi
-            done
-            if [ $success == true ]; then
-                echo " - success";
-                return 0
-            else
-                echo " - failure";
-                return 1
-            fi
-        fi
-        return 0
-    }
   '';
 
   preCommands = ''
@@ -419,19 +393,21 @@ let
     open_with_hardware() {
       local passsphrase
 
-      if wait_fido2key ${toString fido2.gracePeriod}; then
-          ${if fido2.passwordLess then ''
-            export passphrase=""
-          '' else ''
-            echo -n "FIDO2 salt for ${device}: "
-            read -rs passphrase
-            echo
-          ''}
-            echo "Waiting for your FIDO2 device..."
-            fido2luks -i open ${device} ${name} ${fido2.credential} --salt string:$passphrase
-        else
-            echo "No FIDO2 key found, falling back to normal open procedure"
-            open_normally
+        ${if fido2.passwordLess then ''
+          export passphrase=""
+        '' else ''
+          read -rsp "FIDO2 salt for ${device}: " passphrase
+          echo
+        ''}
+        ${optionalString (lib.versionOlder kernelPackages.kernel.version "5.4") ''
+          echo "On systems with Linux Kernel < 5.4, it might take a while to initialize the CRNG, you might want to use linuxPackages_latest."
+          echo "Please move your mouse to create needed randomness."
+        ''}
+          echo "Waiting for your FIDO2 device..."
+          fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase
+        if [ $? -ne 0 ]; then
+          echo "No FIDO2 key found, falling back to normal open procedure"
+          open_normally
         fi
     }
     ''}

From 860a3114f774b87d17295e2f2650b949bf44c8d1 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 22 Jan 2020 08:50:37 +0100
Subject: [PATCH 454/755] fido2luks: 0.2.2 -> 0.2.3

---
 pkgs/tools/security/fido2luks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index 0bb5a91a81a7..4682a09acf5c 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -7,19 +7,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fido2luks";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "shimunn";
     repo = pname;
     rev = version;
-    sha256 = "018qzbgmgm0f0d0c7i54nqqjbr4k5mzy1xfavi6hpifjll971wci";
+    sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x";
   };
 
   buildInputs = [ cryptsetup ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoSha256 = "1kf757wxxk5h8dfbz588qw1pnyjbg5qzr7rz14i7x8rhmn5xwb74";
+  cargoSha256 = "1i37k4ih6118z3wip2qh4jqk7ja2z0v1w8dri1lwqwlciqw17zi9";
   verifyCargoDeps = true;
 
   meta = with stdenv.lib; {

From 8b3715608cc936226706a5b9fbf4e2b353585d5c Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sat, 11 Jan 2020 09:30:47 +0100
Subject: [PATCH 455/755] gensio: init at 1.3.3

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

diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
new file mode 100644
index 000000000000..20e2f6905ce8
--- /dev/null
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "gensio";
+  version = "1.3.3";
+
+  src = fetchFromGitHub {
+    owner = "cminyard";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g";
+  };
+
+  configureFlags = [
+    "--with-python=no"
+  ];
+
+  buildInputs = [ autoreconfHook ];
+
+  meta = with lib; {
+    description = "General Stream I/O";
+    homepage = "https://sourceforge.net/projects/ser2net/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ emantor ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33390a615819..88afc7f2b4af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11477,6 +11477,8 @@ in
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
+  gensio = callPackage ../development/libraries/gensio {};
+
   geoclue2 = callPackage ../development/libraries/geoclue {};
 
   geocode-glib = callPackage ../development/libraries/geocode-glib {};

From 376e8a85f5f4d5517ee3949420bb14de195882a7 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sat, 11 Jan 2020 09:31:51 +0100
Subject: [PATCH 456/755] ser2net: init at 4.1.1

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

diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix
new file mode 100644
index 000000000000..e18d96013e40
--- /dev/null
+++ b/pkgs/servers/ser2net/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "ser2net";
+  version = "4.1.1";
+
+  src = fetchFromGitHub {
+    owner = "cminyard";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "1zl68mmd7pp10cjv1jk8rs2dlbwvzskyb58qvc7ph7vc6957lfhc";
+  };
+
+  buildInputs = [ autoreconfHook gensio libyaml ];
+
+  meta = with lib; {
+    description = "Serial to network connection server";
+    homepage = "https://sourceforge.net/projects/ser2net/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ emantor ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88afc7f2b4af..c7753238f29f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25336,6 +25336,8 @@ in
 
   seafile-shared = callPackage ../misc/seafile-shared { };
 
+  ser2net = callPackage ../servers/ser2net {};
+
   serviio = callPackage ../servers/serviio {};
   selinux-python = callPackage ../os-specific/linux/selinux-python { };
 

From f76597380f7668f658109f6ff29d0e0da59ef388 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 15:47:33 +0000
Subject: [PATCH 457/755] python27Packages.jupytext: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 961eb43f03b5..41eb2b58ca88 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "132bad60c63debfb371a691cb6668a19938ec268599e9c49f1531a3bf0be7b1c";
+    sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say";
   };
 
   propagatedBuildInputs = [

From 7e0dd3833d51294224ac5f5d8fd375e7935f2d0e Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 23 Jan 2020 00:05:34 +0900
Subject: [PATCH 458/755] chatterino2: use mkDerivation from qt

---
 .../networking/instant-messengers/chatterino2/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index becf828a8567..787d66826ef1 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
+{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "chatterino2";
   version = "unstable-2019-05-11";
   src = fetchFromGitHub {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A chat client for Twitch chat";
     longDescription = ''
       Chatterino is a chat client for Twitch chat. It aims to be an

From dc1d9a578d45a14298b3def5c3cdd1b9afc5ada9 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 22 Jan 2020 13:02:36 +0900
Subject: [PATCH 459/755] s-tui: 0.8.3 -> 1.0.0

---
 pkgs/tools/system/s-tui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 063a338f6e8d..924269b6637c 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   pname = "s-tui";
-  version = "0.8.3";
+  version = "1.0.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m";
+    sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From b5035c0892950b5696d1c9a95402084e1c38d18e Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 22 Jan 2020 16:33:15 +0100
Subject: [PATCH 460/755] cri-o: Fix build tags usage

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/cri-o/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 483c6f8b3379..f6e78f364c2c 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -16,8 +16,7 @@
 }:
 
 let
-  makeFlags = "BUILDTAGS=\"apparmor seccomp selinux
-    containers_image_ostree_stub\"";
+  buildTags = "apparmor seccomp selinux containers_image_ostree_stub";
 in buildGoPackage rec {
   project = "cri-o";
   version = "1.16.1";
@@ -47,7 +46,7 @@ in buildGoPackage rec {
     # Build the crio binaries
     function build() {
       go build \
-        -tags ${makeFlags} \
+        -tags "${buildTags}" \
         -o bin/"$1" \
         -buildmode=pie \
         -ldflags '-s -w ${ldflags}' \

From f82528a92b73aab573fa36de46a49185f1e69c99 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakeshgupta4u@gmail.com>
Date: Wed, 22 Jan 2020 20:20:35 +1100
Subject: [PATCH 461/755] updated version to 1.20.1

---
 pkgs/tools/misc/ipxe/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 219c03f263c7..1826bed216da 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools
+{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools
 , embedScript ? null
 , additionalTargets ? {}
 }:
 
 let
-  date = "20190318";
-  rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218";
   targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 {
     "bin-x86_64-efi/ipxe.efi" = null;
     "bin-x86_64-efi/ipxe.efirom" = null;
@@ -19,15 +17,17 @@ let
   };
 in
 
-stdenv.mkDerivation {
-  name = "ipxe-${date}-${builtins.substring 0 7 rev}";
+stdenv.mkDerivation rec {
+  pname = "ipxe";
+  version = "1.20.1";
 
   nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ];
 
-  src = fetchgit {
-    url = https://git.ipxe.org/ipxe.git;
-    sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g";
-    inherit rev;
+  src = fetchFromGitHub {
+    owner = "ipxe";
+    repo = "ipxe";
+    rev = "v${version}";
+    sha256 = "0w7h7y97gj9nqvbmsg1zp6zj5mpbbpckqbbx7bpp6k3ahy5fk8zp";
   };
 
   # not possible due to assembler code

From 558af6fbc7c15f472658339668113f4d5c6440e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Tue, 21 Jan 2020 20:06:11 +0100
Subject: [PATCH 462/755] clang_7,clang_8,clang_9: fix compilation of HIP-code

This PR aims to fix the same problem as NixOS/nixpkgs PR #77476; enabling to
compile HIP-code using the packaged clang compiler, by also searching in $PATH
for required binaries.
The change is committed upstream (https://reviews.llvm.org/D72903), but will
not land in the clang versions in nixpkgs (only clang 10+). As such I have
created patches for the affected versions. To compile HIP-code lld is needed,
so I added it to the clang-package.<Paste>
---
 .../llvm/7/clang/HIP-use-PATH-7.patch         | 68 ++++++++++++++++
 .../compilers/llvm/7/clang/default.nix        | 10 ++-
 pkgs/development/compilers/llvm/7/default.nix |  1 +
 .../llvm/8/clang/HIP-use-PATH-8.patch         | 80 +++++++++++++++++++
 .../compilers/llvm/8/clang/default.nix        |  6 +-
 pkgs/development/compilers/llvm/8/default.nix |  1 +
 .../llvm/9/clang/HIP-use-PATH-9.patch         | 80 +++++++++++++++++++
 .../compilers/llvm/9/clang/default.nix        |  6 +-
 pkgs/development/compilers/llvm/9/default.nix |  1 +
 9 files changed, 246 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
 create mode 100644 pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
 create mode 100644 pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch

diff --git a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch b/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
new file mode 100644
index 000000000000..764dddd966cb
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
@@ -0,0 +1,68 @@
+From 8412cba68835f8f4cc527d02194b181faa5944d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
+Date: Tue, 21 Jan 2020 19:46:09 +0100
+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
+
+This change replaces the manual building of executable paths
+using llvm::sys::path::append with GetProgramPath.
+This enables adding other paths in case executables reside
+in different directories and makes the code easier to read.
+
+Differential Revision: https://reviews.llvm.org/D72903
+---
+ clang/lib/Driver/ToolChains/HIP.cpp | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
+index 03acf45a9b3..75fd3226c75 100644
+--- a/lib/Driver/ToolChains/HIP.cpp
++++ b/lib/Driver/ToolChains/HIP.cpp
+@@ -98,9 +98,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpName));
+   CmdArgs.push_back(OutputFileName);
+-  SmallString<128> ExecPath(C.getDriver().Dir);
+-  llvm::sys::path::append(ExecPath, "llvm-link");
+-  const char *Exec = Args.MakeArgString(ExecPath);
++  const char *Exec =
++      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -141,9 +140,8 @@ const char *AMDGCN::Linker::constructOptCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
+   OptArgs.push_back(OutputFileName);
+-  SmallString<128> OptPath(C.getDriver().Dir);
+-  llvm::sys::path::append(OptPath, "opt");
+-  const char *OptExec = Args.MakeArgString(OptPath);
++  const char *OptExec =
++      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -161,9 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
+   const char *LlcOutputFile =
+       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
+   LlcArgs.push_back(LlcOutputFile);
+-  SmallString<128> LlcPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LlcPath, "llc");
+-  const char *Llc = Args.MakeArgString(LlcPath);
++  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
+   return LlcOutputFile;
+ }
+@@ -178,9 +174,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
+   ArgStringList LldArgs{"-flavor",    "gnu", "--no-undefined",
+                         "-shared",    "-o",  Output.getFilename(),
+                         InputFileName};
+-  SmallString<128> LldPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LldPath, "lld");
+-  const char *Lld = Args.MakeArgString(LldPath);
++  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
+ }
+ 
+-- 
+2.23.1
+
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index 5ac9a7a2672a..825b4abb3e3b 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm ]
+    buildInputs = [ libxml2 llvm lld ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -38,7 +38,11 @@ let
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
 
-    patches = [ ./purity.patch ];
+    patches = [
+      ./purity.patch
+      # make clang -xhip use $PATH to find executables
+      ./HIP-use-PATH-7.patch
+    ];
 
     postPatch = ''
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 621a246225d7..2c3e285e22bf 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -32,6 +32,7 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
+      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {
diff --git a/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch b/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
new file mode 100644
index 000000000000..f4be100d1ab9
--- /dev/null
+++ b/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
@@ -0,0 +1,80 @@
+From d9f1b7d7571b252e0ba2359ae6cfa93a9903c0e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
+Date: Tue, 21 Jan 2020 19:49:44 +0100
+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
+
+This change replaces the manual building of executable paths
+using llvm::sys::path::append with GetProgramPath.
+This enables adding other paths in case executables reside
+in different directories and makes the code easier to read.
+
+Differential Revision: https://reviews.llvm.org/D72903
+---
+ clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lang/lib/Driver/ToolChains/HIP.cpp
+index 868765cf88e..31f2d68ec6c 100644
+--- a/lib/Driver/ToolChains/HIP.cpp
++++ b/lib/Driver/ToolChains/HIP.cpp
+@@ -104,9 +104,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpName));
+   CmdArgs.push_back(OutputFileName);
+-  SmallString<128> ExecPath(C.getDriver().Dir);
+-  llvm::sys::path::append(ExecPath, "llvm-link");
+-  const char *Exec = Args.MakeArgString(ExecPath);
++  const char *Exec =
++      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -147,9 +146,8 @@ const char *AMDGCN::Linker::constructOptCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
+   OptArgs.push_back(OutputFileName);
+-  SmallString<128> OptPath(C.getDriver().Dir);
+-  llvm::sys::path::append(OptPath, "opt");
+-  const char *OptExec = Args.MakeArgString(OptPath);
++  const char *OptExec =
++      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -167,9 +165,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
+   const char *LlcOutputFile =
+       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
+   LlcArgs.push_back(LlcOutputFile);
+-  SmallString<128> LlcPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LlcPath, "llc");
+-  const char *Llc = Args.MakeArgString(LlcPath);
++  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
+   return LlcOutputFile;
+ }
+@@ -184,9 +180,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
+   ArgStringList LldArgs{"-flavor",    "gnu", "--no-undefined",
+                         "-shared",    "-o",  Output.getFilename(),
+                         InputFileName};
+-  SmallString<128> LldPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LldPath, "lld");
+-  const char *Lld = Args.MakeArgString(LldPath);
++  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
+ }
+ 
+@@ -218,9 +212,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
+       Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
+   BundlerArgs.push_back(BundlerOutputArg);
+ 
+-  SmallString<128> BundlerPath(C.getDriver().Dir);
+-  llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
+-  const char *Bundler = Args.MakeArgString(BundlerPath);
++  const char *Bundler = Args.MakeArgString(
++          T.getToolChain().GetProgramPath("clang-offload-bundler"));
+   C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
+ }
+ 
+-- 
+2.23.1
+
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 8c540e45b286..7d7b67adaf04 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm ]
+    buildInputs = [ libxml2 llvm lld ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -50,6 +50,8 @@ let
       ./unwindlib.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
+      # make clang -xhip use $PATH to find executables
+      ./HIP-use-PATH-8.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 36d7a14142b4..f389d1814c0c 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -32,6 +32,7 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
+      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {
diff --git a/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch b/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch
new file mode 100644
index 000000000000..102d810ff681
--- /dev/null
+++ b/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch
@@ -0,0 +1,80 @@
+From 7147e9774c74abcd1d6db24e24d0fd989c2b97dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
+Date: Tue, 21 Jan 2020 19:52:04 +0100
+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
+
+This change replaces the manual building of executable paths
+using llvm::sys::path::append with GetProgramPath.
+This enables adding other paths in case executables reside
+in different directories and makes the code easier to read.
+
+Differential Revision: https://reviews.llvm.org/D72903
+---
+ clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
+index 2ec97e798fd..735c302debb 100644
+--- a/lib/Driver/ToolChains/HIP.cpp
++++ b/lib/Driver/ToolChains/HIP.cpp
+@@ -66,9 +66,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpName));
+   CmdArgs.push_back(OutputFileName);
+-  SmallString<128> ExecPath(C.getDriver().Dir);
+-  llvm::sys::path::append(ExecPath, "llvm-link");
+-  const char *Exec = Args.MakeArgString(ExecPath);
++  const char *Exec =
++      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -114,9 +113,8 @@ const char *AMDGCN::Linker::constructOptCommand(
+   const char *OutputFileName =
+       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
+   OptArgs.push_back(OutputFileName);
+-  SmallString<128> OptPath(C.getDriver().Dir);
+-  llvm::sys::path::append(OptPath, "opt");
+-  const char *OptExec = Args.MakeArgString(OptPath);
++  const char *OptExec =
++      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
+   return OutputFileName;
+ }
+@@ -156,9 +154,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
+   const char *LlcOutputFile =
+       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
+   LlcArgs.push_back(LlcOutputFile);
+-  SmallString<128> LlcPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LlcPath, "llc");
+-  const char *Llc = Args.MakeArgString(LlcPath);
++  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
+   return LlcOutputFile;
+ }
+@@ -172,9 +168,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
+   // The output from ld.lld is an HSA code object file.
+   ArgStringList LldArgs{
+       "-flavor", "gnu", "-shared", "-o", Output.getFilename(), InputFileName};
+-  SmallString<128> LldPath(C.getDriver().Dir);
+-  llvm::sys::path::append(LldPath, "lld");
+-  const char *Lld = Args.MakeArgString(LldPath);
++  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
+   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
+ }
+ 
+@@ -206,9 +200,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
+       Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
+   BundlerArgs.push_back(BundlerOutputArg);
+ 
+-  SmallString<128> BundlerPath(C.getDriver().Dir);
+-  llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
+-  const char *Bundler = Args.MakeArgString(BundlerPath);
++  const char *Bundler = Args.MakeArgString(
++      T.getToolChain().GetProgramPath("clang-offload-bundler"));
+   C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
+ }
+ 
+-- 
+2.23.1
+
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 1b779b118a7f..1eefb9d0a837 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm ]
+    buildInputs = [ libxml2 llvm lld ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -43,6 +43,8 @@ let
       ./purity.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
+      # make clang -xhip use $PATH to find executables
+      ./HIP-use-PATH-9.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index c9e8ce91f0ce..917641d6406f 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -32,6 +32,7 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
+      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {

From 88235d99a484c18a15d573b51520e61d52775fb1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Jan 2020 06:13:51 +1000
Subject: [PATCH 463/755] amass: 3.0.25 -> 3.4.2 (#78001)

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

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 73f54f7dbff7..06eabec06183 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,22 +5,22 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.0.25";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    sha256 = "04vsahqmbs9rysdwyjq0zgwcn6dgdvkyz8lsp1g1p9d3amrgbqjy";
+    sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i";
   };
 
-  modSha256 = "0kwi4pys08kszrh5kz64gs68k20y00v2zqh5hyrgpy9nivqrlj62";
+  modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9";
 
   outputs = [ "out" "wordlists" ];
 
   postInstall = ''
     mkdir -p $wordlists
-    cp -R $src/wordlists/*.txt $wordlists
+    cp -R $src/examples/wordlists/*.txt $wordlists
     gzip $wordlists/*.txt
   '';
 

From ce6dd5eda2bc41956ba8c016f810788766e2ec62 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 7 Jan 2020 12:33:51 +0100
Subject: [PATCH 464/755] wlroots: 0.9.0 -> 0.9.1

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.9.1
---
 pkgs/development/libraries/wlroots/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index d1dcb5993ab0..2e08ca6e90d3 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0sifcrqs82kg9zxqnlr1pl4cw9v9qqakyg3rkysywc9svbikd1g3";
+    sha256 = "0lh0m5wmr5a73zgqnnrrcnrywy7wjsrs839agiq9hf1yrgav3m8z";
   };
 
   # $out for the library and $examples for the example programs (in examples):

From 0c9428188c0b0c0fb319093eaabcf96f5cff7065 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 20:33:01 +0100
Subject: [PATCH 465/755] wlroots: 0.9.0 -> 0.10.0

Changelog: https://github.com/swaywm/wlroots/releases/tag/0.10.0
---
 pkgs/development/libraries/wlroots/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 2e08ca6e90d3..9f9c4acb0d85 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch
 , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg_4, freerdp
+, libpng, ffmpeg_4
 }:
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0lh0m5wmr5a73zgqnnrrcnrywy7wjsrs839agiq9hf1yrgav3m8z";
+    sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8";
   };
 
   # $out for the library and $examples for the example programs (in examples):
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     wayland libGL wayland-protocols libinput libxkbcommon pixman
     xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
-    libpng ffmpeg_4 freerdp
+    libpng ffmpeg_4
   ];
 
   mesonFlags = [

From beca0911f429d6182109c3bcd5f5917da5f21457 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 1 Jan 2020 17:33:31 +0100
Subject: [PATCH 466/755] sway: 1.2 -> 1.4

Changelog: https://github.com/swaywm/sway/releases/tag/1.4
---
 pkgs/applications/window-managers/sway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index c9427fbf695c..a020c10a3485 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sway-unwrapped";
-  version = "1.2";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
+    sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja";
   };
 
   patches = [

From e99b32d27f611ef8674437db8e9ba6654c161465 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 10 Jan 2020 12:26:17 +0100
Subject: [PATCH 467/755] nixos/sway: Install the new default terminal emulator

The default changed in Sway 1.3 from rxvt_unicode to alacritty. For
backward compatibility we'll install both terminal emulators by default.
---
 nixos/modules/programs/sway.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 33e252be45f8..7e646f8737d6 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -87,7 +87,8 @@ in {
       type = with types; listOf package;
       default = with pkgs; [
         swaylock swayidle
-        xwayland rxvt_unicode dmenu
+        xwayland alacritty dmenu
+        rxvt_unicode # For backward compatibility (old default terminal)
       ];
       defaultText = literalExample ''
         with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ];

From 6288a57e3948576b2a98ea7a26ee97afc09be727 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 20:36:38 +0100
Subject: [PATCH 468/755] swaylock: 1.4 -> 1.5

Changelog: https://github.com/swaywm/swaylock/releases/tag/1.5
---
 pkgs/applications/window-managers/sway/lock.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index fe445a6b7adf..dcff3a5c47f6 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -5,17 +5,18 @@
 
 stdenv.mkDerivation rec {
   pname = "swaylock";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swaylock";
     rev = version;
-    sha256 = "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982";
+    sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf";
   };
 
   postPatch = ''
-    sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
+    substituteInPlace meson.build \
+      --replace "version: '1.4'" "version: '${version}'"
   '';
 
   nativeBuildInputs = [ meson ninja pkgconfig scdoc ];

From 2a2f4ff9387258334c08bf2eae777784b9ad21b6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 20:51:31 +0100
Subject: [PATCH 469/755] swayidle: 1.5 -> 1.6

Changelog: https://github.com/swaywm/swayidle/releases/tag/1.6
---
 pkgs/applications/window-managers/sway/idle.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index bc917e76f974..486ab79598df 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -5,15 +5,20 @@
 
 stdenv.mkDerivation rec {
   pname = "swayidle";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swayidle";
     rev = version;
-    sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n";
+    sha256 = "1nd3v8r9549lykdwh4krldfl59lzaspmmai5k1icy7dvi6kkr18r";
   };
 
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace "version: '1.5'" "version: '${version}'"
+  '';
+
   nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
   buildInputs = [ wayland wayland-protocols systemd ];
 

From 4eedf77818f48ff20f18dd14b2d9f719f1f6a573 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Jan 2020 21:15:24 +0100
Subject: [PATCH 470/755] cage: 0.1.1 -> 2020-01-18

---
 .../window-managers/cage/default.nix           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index ce4031b92f56..fe5e9c4e2e34 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , meson, ninja, pkgconfig, makeWrapper
 , wlroots, wayland, wayland-protocols, pixman, libxkbcommon
 , systemd, libGL, libX11
@@ -6,14 +6,20 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "cage";
-  version = "0.1.1";
+  pname = "cage-unstable";
+  version = "2020-01-18";
+  # The last stable release (0.1.1) would require at least the following 3 patches:
+  # - https://github.com/Hjdskes/cage/commit/33bb3c818c5971777b6f09d8821e7f078d38d262.patch
+  # - https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d.patch
+  # - https://github.com/Hjdskes/cage/commit/84216ca2a417b237ad61c11e2f3ebbcb91681ece.patch
+  # Which need to be adapted due to other changes. At this point it seems
+  # better to use the current master version until the next stable release.
 
   src = fetchFromGitHub {
     owner = "Hjdskes";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1";
+    repo = "cage";
+    rev = "cc1f975c442ebd691b70196d76aa120ead717810";
+    sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];

From a76b5a2c94523aa947a81daed2a3e2d0b5917b99 Mon Sep 17 00:00:00 2001
From: Matt Smith <matt@offtopica.uk>
Date: Wed, 22 Jan 2020 21:12:43 +0000
Subject: [PATCH 471/755] maintainers: remove 00-matt

---
 maintainers/maintainer-list.nix                           | 6 ------
 pkgs/applications/networking/cluster/kubeless/default.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2730218f48f7..1f0ead51af15 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -40,12 +40,6 @@
   See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
   */
 {
-  "00-matt" = {
-    name = "Matt Smith";
-    email = "matt@offtopica.uk";
-    github = "00-matt";
-    githubId = 48835712;
-  };
   "0x4A6F" = {
     email = "0x4A6F@shackspace.de";
     name = "Joachim Ernst";
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
index aaf183ad6667..48540bffb536 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/pkgs/applications/networking/cluster/kubeless/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
     homepage = "https://kubeless.io";
     description = "The Kubernetes Native Serverless Framework";
     license = licenses.asl20;
-    maintainers = with maintainers; [ "00-matt" ];
+    maintainers = with maintainers; [];
     platforms = platforms.unix;
   };
 }

From f25166203a602e26324bbf4689a9f14858c9b8a0 Mon Sep 17 00:00:00 2001
From: blanky0230 <blanky0230@gmail.com>
Date: Fri, 15 Nov 2019 16:42:35 +0100
Subject: [PATCH 472/755] maintainers: add blanky0230 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 2730218f48f7..7e8042292ee4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -957,6 +957,11 @@
     githubId = 5718007;
     name = "Bastian Köcher";
   };
+  blanky0230 = {
+    email = "blanky0230@gmail.com";
+    github = "blanky0230";
+    name = "Thomas Blank";
+  };
   blitz = {
     email = "js@alien8.de";
     github = "blitz";

From 01dd056c3f876107277ac92a4b47726e73177f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 22 Jan 2020 18:16:56 -0300
Subject: [PATCH 473/755] lxqt.screengrab: 1.101 -> 2.0.0

---
 pkgs/desktops/lxqt/screengrab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 380e50e827e8..7eff539091fc 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "screengrab";
-  version = "1.101";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    sha256 = "111gnkhp77qkch7xqr7k3h8zrg4871gapyd4vvlpaj0gjhirjg6h";
+    sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Crossplatform tool for fast making screenshots";
-    homepage = https://github.com/lxqt/screengrab;
+    homepage = "https://github.com/lxqt/screengrab";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];

From 795729fa82b4daae9b2a5877890f6e44b8e23c40 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 20:39:11 +0000
Subject: [PATCH 474/755] python27Packages.shodan: 1.21.1 -> 1.21.2

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

diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 52dc89e3a962..909c54788b2c 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "shodan";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "834dfd084fed290b2b445545b0d1cac7822f3c0ed6ba09707efb1716bb485ede";
+    sha256 = "1pbfmab3ixvaa845qp6ms2djcwp9c5vnlsr2bf9prmx5973khg7d";
   };
 
   propagatedBuildInputs = [

From 28774cc835b915f593ea4a9ca73db6d4744e2d08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 16:03:00 +0000
Subject: [PATCH 475/755] python27Packages.bumps: 0.7.13 -> 0.7.14

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

diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 05506a12db00..c1e19eb85600 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "bumps";
-  version = "0.7.13";
+  version = "0.7.14";
 
   propagatedBuildInputs = [six];
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fdcf335b800d892edfdbc87fdd539cb45166d8667edbec3dfbb1a3b5c3a35547";
+    sha256 = "0l0ljm7n19522m6mb0jnbcwdyqya15vfj3li3mvfsyv4rkxvy18b";
   };
 
   meta = with stdenv.lib; {

From 3d01d56df379a66f9c87f8ebcabdd60f946e0bee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 19:20:42 +0000
Subject: [PATCH 476/755] python27Packages.python-telegram-bot: 12.2.0 ->
 12.3.0

---
 .../python-modules/python-telegram-bot/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 52fe5209ade2..113422374790 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "12.2.0";
+  version = "12.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "346d42771c2b23384c59f5f41e05bd7e801a0ce118d8dcb95209bb73d5f694c5";
+    sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21";
   };
 
   prePatch = ''

From af138319c068859c4ed6baaa1ff9457df1370614 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 19:26:34 +0000
Subject: [PATCH 477/755] python27Packages.phonenumbers: 8.11.1 -> 8.11.2

---
 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 461d70497bf0..c0e86dd37514 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.11.1";
+  version = "8.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "239507184ee5b1b83557005af1d5fcce70f83ae18f5dff45b94a67226db10d63";
+    sha256 = "0j73mr3d3rf2r4nkaxbvl7323xima0l95pjagjzgk2piqwa3nbd2";
   };
 
   meta = {

From becf4017c5656c3cab531063b47586c5501e00fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 02:56:38 +0100
Subject: [PATCH 478/755] cinnamon.nemo: init at 4.4.1

---
 pkgs/desktops/cinnamon/default.nix      |  1 +
 pkgs/desktops/cinnamon/nemo/default.nix | 76 +++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/nemo/default.nix

diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 4ffbf8f6bb31..0d4761545740 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -3,5 +3,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cjs = callPackage ./cjs { };
+  nemo = callPackage ./nemo { };
   xapps = callPackage ./xapps { };
 })
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
new file mode 100644
index 000000000000..419aaf249f70
--- /dev/null
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -0,0 +1,76 @@
+{ fetchFromGitHub
+, fetchpatch
+, glib
+, gobject-introspection
+, meson
+, ninja
+, pkgconfig
+, stdenv
+, wrapGAppsHook
+, libxml2
+, gtk3
+, libnotify
+, cinnamon-desktop
+, xapps
+, libexif
+, exempi
+, intltool
+, shared-mime-info
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nemo";
+  version = "4.4.1";
+
+  # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0sskq0rssxvna937md446x1489hkhxys1zq03hvl8asjqa259w2q";
+  };
+
+  patches = [
+    (fetchpatch { # details see https://github.com/linuxmint/nemo/pull/2303
+      url = "https://github.com/linuxmint/nemo/pull/2303/commits/9c1ec7812abe712419317df07d6b64623e8f639d.patch";
+      sha256 = "09dz7lq3i47rbvycawrxwgjmd9g1mhb76ibx2vq85wck6r08arml";
+    })
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libnotify
+    cinnamon-desktop
+    libxml2
+    xapps
+    libexif
+    exempi
+    gobject-introspection
+  ];
+
+  nativeBuildInputs = [
+    meson
+    pkgconfig
+    ninja
+    wrapGAppsHook
+    intltool
+    shared-mime-info
+  ];
+
+  mesonFlags = [
+    # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+    "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/nemo";
+    description = "File browser for Cinnamon";
+    license = [ licenses.gpl2 licenses.lgpl2 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}

From 0382d990ac62a9d7d37ca6e44822e8f67c47e829 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 20:50:27 +0000
Subject: [PATCH 479/755] python27Packages.spotipy: 2.4.4 -> 2.6.1

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

diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 70471aedbd76..e728739c294d 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "spotipy";
-  version = "2.4.4";
+  version = "2.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab";
+    sha256 = "1jpj9ljc5g89jbnzwnmgz5s6jdrsgd6g9s09igvbw3pppi9070h0";
   };
 
   propagatedBuildInputs = [ requests ];

From 5e1aed0b03701a3b60df42460fbcf155dd36e2fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:31:39 +0000
Subject: [PATCH 480/755] python27Packages.libnacl: 1.6.1 -> 1.7.1

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

diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 54b98cf21368..893789d961d9 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "libnacl";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "saltstack";
     repo = pname;
     rev = "v${version}";
-    sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
+    sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg";
   };
 
   checkInputs = [ pytest ];

From 15043153614836dad935f4e252b145d2b5610723 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 19:13:51 +0000
Subject: [PATCH 481/755] python27Packages.python-dotenv: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index ba74817a63fd..f43d8d0575b9 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi";
+    sha256 = "16s2x5ghrhz9ljm6h3y0pbwh97558vbs7l0yiicag4s0xyn0nzq0";
   };
 
   propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];

From 7d723243217684c232f8ed212064289a629f7819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 22 Jan 2020 11:08:15 +0100
Subject: [PATCH 482/755] cinnamon.*: add licenses

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/desktops/cinnamon/cinnamon-desktop/default.nix      | 1 +
 pkgs/desktops/cinnamon/cinnamon-menus/default.nix        | 1 +
 pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 1 +
 pkgs/desktops/cinnamon/cjs/default.nix                   | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index 094140cbf4ee..a622e6abfd12 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
       gtk-doc.
     '';
 
+    license = [ licenses.gpl2 licenses.lgpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.mkg20001 ];
   };
diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
index 562ecdbfa77b..47242cdf38a5 100644
--- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://github.com/linuxmint/cinnamon-menus";
     description = "A menu system for the Cinnamon project";
+    license = [ licenses.gpl2 licenses.lgpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.mkg20001 ];
   };
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
index 65df49a5a1c0..b03678c5d7ac 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://github.com/linuxmint/cinnamon-translations";
     description = "Translations files for the Cinnamon desktop";
+    license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.mkg20001 ];
   };
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index a240f670be00..9dbab8fd767e 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -78,6 +78,12 @@ stdenv.mkDerivation rec {
       This module contains JavaScript bindings based on gobject-introspection.
     '';
 
+    license = with licenses; [
+     gpl2Plus
+     lgpl2Plus
+     mit
+     mpl11
+   ];
     platforms = platforms.linux;
     maintainers = [ maintainers.mkg20001 ];
   };

From 2356a43830711aedf7da7e1619f26c9288a3d4ea Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Wed, 22 Jan 2020 12:24:45 +0200
Subject: [PATCH 483/755] teams: 1.2.00.32451 -> 1.3.00.958

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

diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 0921dcfccdd9..ef7e3717f728 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "teams";
-  version = "1.2.00.32451";
+  version = "1.3.00.958";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
-    sha256 = "1p053kg5qksr78v2h7cxia5mb9kzgfwm6n99x579vfx48kka1n18";
+    sha256 = "015awxgbwk4j973jnxj7q3i8csx7wnwpwp5g4jlmn7z8fxwy83d5";
   };
 
   nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];

From e1dac71685d87d7d8326227a16eb3b177c835a8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:04:48 +0000
Subject: [PATCH 484/755] python37Packages.jupyterlab: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 32d3ad0bada3..ece3b4e3ed5c 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "1.2.4";
+  version = "1.2.5";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6adb88acd05b51512c37df477a18c36240823a591c2a51bf6556198414026d8f";
+    sha256 = "086zl3pdsq2jwcxv7ppp3lpwh25mgnn0y0s6scmkrz158yj55kp3";
   };
 
   propagatedBuildInputs = [ jupyterlab_server notebook ];

From 96de24cfdbf15124cb8fbb6eb83e6a106d7eb622 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 22 Jan 2020 23:38:54 +0100
Subject: [PATCH 485/755] grafana-loki: 1.2.0 -> 1.3.0, patch distributor test

Only include the loopback interface "lo" in the lifecycler configuration
of the distributor test.
---
 pkgs/servers/monitoring/loki/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 895621d4cba6..b5e63a3aed42 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
 
 buildGoPackage rec {
-  version = "1.2.0";
+  version = "1.3.0";
   pname = "grafana-loki";
   goPackagePath = "github.com/grafana/loki";
 
@@ -11,9 +11,15 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "loki";
-    sha256 = "04ix58gb9yy5jf8fhn3k1pbwqs69k7m96cck38ymhwml1793b4k9";
+    sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q";
   };
 
+  postPatch = ''
+    substituteInPlace pkg/distributor/distributor_test.go --replace \
+      '"eth0", "en0", "lo0"' \
+      '"lo"'
+  '';
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
 

From 07b977df89a9cec2184fbf161dd425c43e91beb8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 10 Jan 2020 15:59:41 -0500
Subject: [PATCH 486/755] linux_hardkernel_4_14: 4.14.120-160 -> 4.14.165-172

---
 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 df741d9a029b..ba37c71d1345 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.120-160";
+  version = "4.14.165-172";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.120";
+  modDirVersion = "4.14.165";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr";
+    sha256 = "10ayqjjs2hxj1q7sb0mxa3gv75q28lznjha19rpxvig2fpi8015s";
   };
 
   defconfig = "odroidxu4_defconfig";

From bce8f64c78e60be71113c9b1eea86c2c15be96e2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 22 Jan 2020 18:18:18 -0500
Subject: [PATCH 487/755] vault: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 11b0b067ccb8..3b209d5c0689 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "vault";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "052aj79gwmydc7ph1g567cbssqf8dsmqxad47k5hc5sc58bx7c93";
+    sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg";
   };
 
   goPackagePath = "github.com/hashicorp/vault";

From d0819c05b3f62529f0230aa5e7f13418e07092ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 22 Jan 2020 18:18:18 -0500
Subject: [PATCH 488/755] terraform: 0.12.19 -> 0.12.20

Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.20
---
 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 b290f3b5f043..5c1319486497 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.19";
-    sha256 = "067gzxysz8r2myj3rh0vwrs0pmbgb21jxlmawlf4v0lkjnhj6kwv";
+    version = "0.12.20";
+    sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 5a4afd2cc43424689a4521da2c97074fb07c12ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 23:33:25 +0000
Subject: [PATCH 489/755] qview: 2.0 -> 3.0

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

diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index 0595ab2963ca..8df6ce4f80ba 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchFromGitHub, qmake}:
 stdenv.mkDerivation rec {
   pname = "qview";
-  version = "2.0";
+  version = "3.0";
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
     rev = version;
-    sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5";
+    sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";
   };
   nativeBuildInputs = [ qmake ];
   patchPhase = ''

From c78d8aaeaae18c15f5ca3544780e5c7be6334b71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 23 Jan 2020 00:20:25 +0000
Subject: [PATCH 490/755] libsForQt5.qtutilities: 6.0.2 -> 6.0.3

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

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index b6f424ee35c9..94e83c883c42 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hsi6c1466m5lgh8ayhf3hj4ddy6ambraagzgvvy7g370z4mx2yw";
+    sha256 = "184lcw56r0hq3d6msy5ccscs01zhvml7m4w56wbvy9lzcc4sk200";
   };
 
   buildInputs = [ qtbase cpp-utilities ];

From 8f9f1712b7ba20f694730a884053234a33fa1e1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 23:00:00 +0000
Subject: [PATCH 491/755] python27Packages.qtawesome: 0.6.0 -> 0.6.1

---
 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 a6c431764be6..9392504ce263 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.6.0";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05qypwlzjkw31x7qgn01d4kcf40mbymg5c9h3i7cx2r8sw29akjy";
+    sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq";
   };
 
   propagatedBuildInputs = [ qtpy six ];

From abc34ea707fe27b89e269ab946f8af5561b7d008 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 22:36:42 +0000
Subject: [PATCH 492/755] python37Packages.praw: 6.4.0 -> 6.5.1

---
 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 14166b4f43cb..47715b9e5679 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "6.4.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     rev = "v${version}";
-    sha256 = "0j92wqyppif2k80zhzq30b04r8ljwjviply400kn4rjn54hxd4hb";
+    sha256 = "0d5whaw4731gllffhwrh2qqnlki4j8q83xaf3v4spkd40ps3q7b4";
   };
 
   nativeBuildInputs = [

From 55c3d1b9dfbdcfe5c43945231cce7d4f9d025fcb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 22:57:10 +0000
Subject: [PATCH 493/755] python27Packages.stripe: 2.41.0 -> 2.42.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index d564adbc6e25..3f1c1e53c7c2 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "2.41.0";
+  version = "2.42.0";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f0ec677136985ece9cca232f106c2a87193261cac1fe58d4e959215310a0da8";
+    sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9";
   };
 
   propagatedBuildInputs = [ requests ];

From daefd38e644470eda0f8e72806613c4093083e8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:41:24 +0000
Subject: [PATCH 494/755] python37Packages.azure-mgmt-hdinsight: 1.3.0 -> 1.4.0

---
 .../python-modules/azure-mgmt-hdinsight/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index 6cda959448cf..4b8aef08f1c5 100644
--- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.0";
+  version = "1.4.0";
   pname = "azure-mgmt-hdinsight";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "55e129da3c3750cd5a26b91035990590a3f97aef4971de62d84de00f4fd6f1e4";
+    sha256 = "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv";
     extension = "zip";
   };
 

From 1b1835e2ec173166563221c523dbb90c3133461f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 14:16:17 +0000
Subject: [PATCH 495/755] python37Packages.html2text: 2019.9.26 -> 2020.1.16

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

diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix
index 9b289032514e..a0462795d232 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/pkgs/development/python-modules/html2text/default.nix
@@ -4,14 +4,14 @@
 
 buildPythonPackage rec {
   pname = "html2text";
-  version = "2019.9.26";
+  version = "2020.1.16";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "Alir3z4";
     repo = pname;
     rev = version;
-    sha256 = "1gzcx4n6q71plq4zvb1z0fy3brrln0qqrd6jc89iiqn7r1ix8h87";
+    sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9";
   };
 
   # python setup.py test is broken, use pytest

From 6b425756b8a74de4855412afc050b64fabb67799 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:49:58 +0000
Subject: [PATCH 496/755] python27Packages.azure-mgmt-recoveryservicesbackup:
 0.5.0 -> 0.6.0

---
 .../azure-mgmt-recoveryservicesbackup/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 1f3056b90985..990f494ecedc 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservicesbackup";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl";
+    sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
   };
 
   propagatedBuildInputs = [

From d4a282dfefe16e29c6239e323492b6b5c6b4430b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:42:38 +0000
Subject: [PATCH 497/755] python37Packages.azure-mgmt-netapp: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 8e18986bfcbb..6bf207c6e4c5 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.7.0";
+  version = "0.8.0";
   pname = "azure-mgmt-netapp";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3";
+    sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7";
     extension = "zip";
   };
 

From f567824479bf15efdf5c86a49943f0b54a90c77e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 12:26:40 +0000
Subject: [PATCH 498/755] python27Packages.diff_cover: 2.5.0 -> 2.5.2

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

diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix
index ed16f7f95e52..7066a188c773 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/pkgs/development/python-modules/diff_cover/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "diff_cover";
-  version = "2.5.0";
+  version = "2.5.2";
 
   preCheck = ''
     export LC_ALL=en_US.UTF-8;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ba4e8dcd5439a245287fac056db02a9261432b1a44a5cffbe593032de86f1c7";
+    sha256 = "09pgzx2m04hzpckwgz4iz9590ll5fk1mirlra89qps8ig1xmz5m5";
   };
 
   propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ];

From ef9939e36fa17ee6f5e90806e06ccd66a86ce87b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:00:20 +0000
Subject: [PATCH 499/755] python37Packages.aiohttp-socks: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index d6487c8157b1..782238c3f832 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-socks";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchPypi {
     inherit version;
     pname = "aiohttp_socks";
-    sha256 = "21974ce5d782c426ddbf7bdfc5e602a38783b1ee839a4a0ed0990240e2e123b5";
+    sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd";
   };
 
   propagatedBuildInputs = [ aiohttp attrs ];

From 230562a6dfed97bc5e2ad4dce6656c665a631340 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 11:59:01 +0000
Subject: [PATCH 500/755] python27Packages.azure-mgmt-containerservice: 8.1.0
 -> 8.2.0

---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 5d1e3e6e3a97..41124e448541 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "21fabdd393ba2ff1162a490cfa0d2b72a715da8462b1645bd986241137fc771f";
+    sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr";
   };
 
   propagatedBuildInputs = [

From aee024905954d9e7d2aa16afa38f9ac79d2dda78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:20:43 +0000
Subject: [PATCH 501/755] python27Packages.azure-mgmt-media: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 90b45d0e3f05..f3dfaba6d9cb 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-media";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b144e66cb8b947b871354edbcee15b78e107fb8f3a337d46d04cd8b73300741b";
+    sha256 = "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
   };
 
   propagatedBuildInputs = [

From 367193218862bb927d13e20235fb60a92fc51d9a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 22 Jan 2020 17:59:31 -0800
Subject: [PATCH 502/755] python38Packages.uvloop: disable

Tests hang, indicating race condition
---
 pkgs/development/python-modules/uvloop/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index b1fbf26e43b1..00e2c5e2a4b4 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -6,6 +6,7 @@
 , libuv
 , psutil
 , isPy27
+, pythonAtLeast
 , CoreServices
 , ApplicationServices
 }:
@@ -13,7 +14,8 @@
 buildPythonPackage rec {
   pname = "uvloop";
   version = "0.14.0";
-  disabled = isPy27;
+  # python 3.8 hangs on tests, assuming it's subtly broken with race condition
+  disabled = isPy27 || pythonAtLeast "3.8";
 
   src = fetchPypi {
     inherit pname version;

From 35f6a7406d49277a9b92d0ad20fbd75f24eea551 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 22 Jan 2020 17:18:23 -0800
Subject: [PATCH 503/755] python38Packages.aiohttp: disable

Looks like "+" operator between futures no longer works.
Reported upstream https://github.com/aio-libs/aiohttp/issues/4525
---
 pkgs/development/python-modules/aiohttp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 40dec3e1c1ee..0cecdb0291e9 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, pythonAtLeast
 , attrs
 , chardet
 , multidict
@@ -25,14 +26,14 @@
 buildPythonPackage rec {
   pname = "aiohttp";
   version = "3.6.2";
+  # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
+  disabled = pythonOlder "3.5" || pythonAtLeast "3.8";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
   };
 
-  disabled = pythonOlder "3.5";
-
   checkInputs = [
     pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist
     pytest-mock pytestcov trustme brotlipy freezegun

From c2a3fed5b35fc80c42ac8a69665cb01292438076 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 21 Jan 2020 12:15:03 -0800
Subject: [PATCH 504/755] python3Packages.ppft: re-enable tests

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

diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index 101c10b1d12d..8731c997aa73 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, python
 , six
 }:
 
@@ -15,8 +16,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  # tests no longer packages on pypi
-  doCheck = false;
+  # darwin seems to hang
+  doCheck = !stdenv.isDarwin;
+  checkPhase = ''
+    cd examples
+    ${python.interpreter} -m ppft.tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Distributed and parallel python";

From 5c8c62902ff033b94aa3f6bc483d05ad7c104214 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:12:19 +0000
Subject: [PATCH 505/755] python27Packages.bitarray: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index f119aedc4b82..d89ab9c3107c 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "bitarray";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4f8706b651243c9faa981f075bcbdef2fab83e9b9bc9211ed2cb5849f9a68342";
+    sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif";
   };
 
   meta = with lib; {

From d1ba7dae91d691d1f14a9aa361138acef1f2ac7f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 23:38:16 +0000
Subject: [PATCH 506/755] qmmp: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 801d32189bfd..a941ea485b79 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 mkDerivation rec {
-  name = "qmmp-1.3.5";
+  name = "qmmp-1.3.6";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0h7kcqzhfvk610937pwrhizcdgd4n7ncl1vayv6sj3va1x7pv6xm";
+    sha256 = "0dihy6v6j1cfx4qgwgajdn8rx6nf8x5srk8yjki9xh1mlcaanhp8";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 34719fa2c7af132b34ead47dc5203e607969f2e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 11:47:42 +0000
Subject: [PATCH 507/755] python27Packages.boltons: 19.3.0 -> 20.0.0

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

diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 8b7139f5a627..6470b7da859d 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "boltons";
-  version = "19.3.0";
+  version = "20.0.0";
 
   # No tests in PyPi Tarball
   src = fetchFromGitHub {
     owner = "mahmoud";
     repo = "boltons";
     rev = version;
-    sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn";
+    sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz";
   };
 
   checkInputs = [ pytest ];

From c221115c4fc23db4df8b0466ba6a8c4555b2878c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 13:03:27 +0000
Subject: [PATCH 508/755] python37Packages.hstspreload: 2019.12.25 -> 2020.1.17

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

diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index a276bd33b592..918ed268afa5 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "hstspreload";
-  version = "2019.12.25";
+  version = "2020.1.17";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = pname;
     rev = version;
-    sha256 = "1aa7jccwldxw3s0z668qqb0i0plsark1q3jvkmqkyp645w5bfilk";
+    sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v";
   };
 
   # tests require network connection

From 66675b5650b63e2aecd4ceef4d34f1a1d56b9c95 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 22 Jan 2020 00:39:54 +0100
Subject: [PATCH 509/755] python2.pkgs.ipython: use the proper python2 lexer

Since pygments 2.5 `PythonLexer` refers to python3 [1]. We have to be
explicit if we want to use python2.

[1] https://pygments.org/docs/changelog/
---
 pkgs/development/python-modules/ipython/5.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 15e7d00bcece..dd0c97fc3c56 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 # Build dependencies
 , glibcLocales
 # Test dependencies
@@ -36,6 +37,15 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "'gnureadline'" " "
   '';
 
+  patches = [
+    # Use the proper pygments lexer for python2 (https://github.com/ipython/ipython/pull/12095)
+    (fetchpatch {
+      name = "python2-lexer.patch";
+      url = "https://github.com/ipython/ipython/pull/12095/commits/8805293b5e4bce9150cc2ad9c5d6d984849ae447.patch";
+      sha256 = "16p4gl7a49v76w33j39ih7yspy6x2d14p9bh4wdpg9cafhw9nbc0";
+    })
+  ];
+
   buildInputs = [ glibcLocales ];
 
   checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;

From 0811a69fef6e42aa40d859526f0ce9d667d36f52 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 22 Jan 2020 23:34:44 +0100
Subject: [PATCH 510/755] python2.pkgs.sphinx: user proper python2 lexer

---
 pkgs/development/python-modules/sphinx/2.nix  |  7 ++++++
 .../python-modules/sphinx/python2-lexer.patch | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx/python2-lexer.patch

diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix
index b6374989690e..541c292fe8f1 100644
--- a/pkgs/development/python-modules/sphinx/2.nix
+++ b/pkgs/development/python-modules/sphinx/2.nix
@@ -60,6 +60,13 @@ buildPythonPackage rec {
   # Lots of tests. Needs network as well at some point.
   doCheck = false;
 
+  patches = [
+    # Since pygments 2.5, PythonLexer refers to python3. If we want to use
+    # python2, we need to explicitly specify Python2Lexer.
+    # Not upstreamed since there doesn't seem to be any upstream maintenance
+    # branch for 1.8 (and this patch doesn't make any sense for 2.x).
+    ./python2-lexer.patch
+  ];
   # https://github.com/NixOS/nixpkgs/issues/22501
   # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
   postPatch = ''
diff --git a/pkgs/development/python-modules/sphinx/python2-lexer.patch b/pkgs/development/python-modules/sphinx/python2-lexer.patch
new file mode 100644
index 000000000000..cf4a243315a2
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx/python2-lexer.patch
@@ -0,0 +1,22 @@
+diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
+index ac2bd1b06..63ca52de2 100644
+--- a/sphinx/highlighting.py
++++ b/sphinx/highlighting.py
+@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
+ from pygments.formatters import HtmlFormatter, LatexFormatter
+ from pygments.lexer import Lexer  # NOQA
+ from pygments.lexers import get_lexer_by_name, guess_lexer
+-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
++from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
+     CLexer, TextLexer, RstLexer
+ from pygments.styles import get_style_by_name
+ from pygments.util import ClassNotFound
+@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
+ 
+ lexers = dict(
+     none = TextLexer(stripnl=False),
+-    python = PythonLexer(stripnl=False),
++    python = Python2Lexer(stripnl=False),
+     python3 = Python3Lexer(stripnl=False),
+     pycon = PythonConsoleLexer(stripnl=False),
+     pycon3 = PythonConsoleLexer(python3=True, stripnl=False),

From e527dc62d71cebe35c1bbd933e3317e5a7f6fd5b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 23 Jan 2020 17:08:35 +0800
Subject: [PATCH 511/755] mc: /bin/rm does not exist

---
 pkgs/tools/misc/mc/default.nix | 47 ++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index b2711903ead1..168afc7efedd 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -1,5 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs
-, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}:
+{ stdenv
+, fetchurl
+, pkgconfig
+, glib
+, gpm
+, file
+, e2fsprogs
+, libX11
+, libICE
+, perl
+, zip
+, unzip
+, gettext
+, slang
+, libssh2
+, openssl
+, coreutils
+}:
 
 stdenv.mkDerivation rec {
   pname = "mc";
@@ -13,26 +29,41 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
-    perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
+    file
+    gettext
+    glib
+    libICE
+    libX11
+    libssh2
+    openssl
+    perl
+    slang
+    unzip
+    zip
   ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
 
   enableParallelBuilding = true;
 
   configureFlags = [ "--enable-vfs-smb" ];
 
+  postPatch = ''
+    substituteInPlace src/filemanager/ext.c \
+      --replace /bin/rm ${coreutils}/bin/rm
+  '';
+
   postFixup = ''
     # remove unwanted build-dependency references
     sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "File Manager and User Shell for the GNU Project";
-    homepage = http://www.midnight-commander.org;
     downloadPage = "http://www.midnight-commander.org/downloads/";
+    homepage = "http://www.midnight-commander.org";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ sander ];
+    platforms = with platforms; linux ++ darwin;
     repositories.git = git://github.com/MidnightCommander/mc.git;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
     updateWalker = true;
   };
 }

From dfaae48381634bb55a5e5e56b650d0867d950246 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 04:20:00 -0500
Subject: [PATCH 512/755] broot: 0.11.9 -> 0.12.0

---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index bca0f8099091..7f8a9dbde576 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.11.9";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kif1113qdxg4hr1mfgg1fh10zgl9cl117cm1bfjaabw11k75cvj";
+    sha256 = "0z31yizjczr59z6vxgjc3lqlcr3m21bi5ly8pxp3s3w7nbfr369q";
   };
 
-  cargoSha256 = "0636qkgkw027s5dz2mryhghlm6kn3s7cfy4i8rxywr8r3w8c40y0";
+  cargoSha256 = "0cwj63907xwy1ali9p2wnzhlcb80c6nhf684fbbsg7awiyqgdak3";
   verifyCargoDeps = true;
 
   nativeBuildInputs = [ installShellFiles ];

From 28e4113a78192fc10aa475e42c175142be58a010 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 04:20:00 -0500
Subject: [PATCH 513/755] nodejs-13_x: 13.6.0 -> 13.7.0

---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index 1c32310a82d4..db1705d481e0 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.6.0";
-    sha256 = "0jf9nn5i1bijmrcgjvkp37fyz63lwwmxjh7nxipn2vw2qdx6ngsm";
+    version = "13.7.0";
+    sha256 = "1fql5858aqny8krrqrgdp97kfia8xv0jlviwnm3akmv8i1i6xqkh";
   }

From 166ac309e758bb379a2c3f6434fed3f19808a508 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 05:30:00 -0500
Subject: [PATCH 514/755] spotify-tui: 0.11.0 -> 0.12.0

Changelog: https://github.com/Rigellute/spotify-tui/releases/tag/v0.12.0
---
 pkgs/applications/audio/spotify-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 973062ecb750..6f8fc541ad76 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "1pshwn486msn418dilk57rl9471aas0dif765nx1p9xgkrjpb7wa";
+    sha256 = "18ja0a7s6lhz6y8fmpmabv95zkcfazj0qc0dsd9dblfzzjhvmw39";
   };
 
-  cargoSha256 = "0020igycgikkbd649hv6xlpn13dij4g7yc43fic9z710p6nsxqaq";
+  cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From a605fcabae350b4106bfa75102bee64c1bddec3f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Jan 2020 13:16:58 +0100
Subject: [PATCH 515/755] evcxr: 0.4.6 -> 0.5.0

https://crates.io/crates/evcxr/0.5.0
---
 pkgs/development/interpreters/evcxr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 1cc63788555f..168b012efcc1 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
-  version = "0.4.6";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
-    rev = "v${version}";
-    sha256 = "1yzvqf93zz3ncck4dyq2kayp408lm3h6fx0fb212j7h70mlzx984";
+    rev = "239e431c58d04c641da22af791e4d3e1b894365e";
+    sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc";
   };
 
-  cargoSha256 = "0g17g12isah4nkqp9i299qr1sz19k4czcc43rm1wbs0y9szaqvwc";
+  cargoSha256 = "04wffj2y9pqyk0x3y6ghp06pggmxnk2h245iabqq0mpwx36fd8b6";
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

From e65da6853fc54b79c8aa9a9b63bda035983e5919 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 23 Jan 2020 13:13:34 +0100
Subject: [PATCH 516/755] dat: init at 13.13.1

---
 pkgs/applications/networking/dat/default.nix | 92 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/applications/networking/dat/default.nix

diff --git a/pkgs/applications/networking/dat/default.nix b/pkgs/applications/networking/dat/default.nix
new file mode 100644
index 000000000000..2e0f8005bdbd
--- /dev/null
+++ b/pkgs/applications/networking/dat/default.nix
@@ -0,0 +1,92 @@
+{ stdenv
+, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dat";
+  version = "13.13.1";
+
+  suffix = {
+    x86_64-darwin = "macos-x64";
+    x86_64-linux  = "linux-x64";
+  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  src = fetchurl {
+    url = "https://github.com/datproject/dat/releases/download/v${version}/${pname}-${version}-${suffix}.zip";
+    sha256 = {
+      x86_64-darwin = "1qj38zn33hhr2v39jw14k2af091bafh5yvhs91h5dnjb2r8yxnaq";
+      x86_64-linux  = "0vgn57kf3j1pbfxlhj4sl1sm2gfd2gcvhk4wz5yf5mzq1vj9ivpv";
+    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  };
+
+  buildInputs = [ unzip ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontStrip = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv dat $out/bin
+  '';
+
+  # dat is a node program packaged using zeit/pkg.
+  # thus, it contains hardcoded offsets.
+  # patchelf shifts these locations when it expands headers.
+
+  # this could probably be generalised into allowing any program packaged
+  # with zeit/pkg to be run on nixos.
+
+  preFixup = let
+    libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc];
+  in stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    orig_size=$(stat --printf=%s $out/bin/dat)
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/dat
+    patchelf --set-rpath ${libPath} $out/bin/dat
+    chmod +x $out/bin/dat
+
+    new_size=$(stat --printf=%s $out/bin/dat)
+
+    ###### zeit-pkg fixing starts here.
+    # we're replacing plaintext js code that looks like
+    # PAYLOAD_POSITION = '1234                  ' | 0
+    # [...]
+    # PRELUDE_POSITION = '1234                  ' | 0
+    # ^-----20-chars-----^^------22-chars------^
+    # ^-- grep points here
+    #
+    # var_* are as described above
+    # shift_by seems to be safe so long as all patchelf adjustments occur
+    # before any locations pointed to by hardcoded offsets
+
+    var_skip=20
+    var_select=22
+    shift_by=$(expr $new_size - $orig_size)
+
+    function fix_offset {
+      # $1 = name of variable to adjust
+      location=$(grep -obUam1 "$1" $out/bin/dat | cut -d: -f1)
+      location=$(expr $location + $var_skip)
+
+      value=$(dd if=$out/bin/dat iflag=count_bytes,skip_bytes skip=$location \
+                 bs=1 count=$var_select status=none)
+      value=$(expr $shift_by + $value)
+
+      echo -n $value | dd of=$out/bin/dat bs=1 seek=$location conv=notrunc
+    }
+
+    fix_offset PAYLOAD_POSITION
+    fix_offset PRELUDE_POSITION
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Peer-to-peer sharing and live synchronization of files";
+    homepage = "https://dat.foundation/";
+    license = licenses.bsd3;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7753238f29f..7ceae502855d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25899,4 +25899,6 @@ in
   unstick = callPackage ../os-specific/linux/unstick {};
 
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
+
+  dat = callPackage ../applications/networking/dat { };
 }

From 23d5d9bbe9aab982d17ad92c0d9da291d01f60c7 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 23 Jan 2020 13:51:00 +0100
Subject: [PATCH 517/755] nixos/alertmanager: add environmentFile, envsubst for
 secrets

---
 .../monitoring/prometheus/alertmanager.nix    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 9af6b1d94f37..3c9ca6c7d376 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -18,7 +18,7 @@ let
     in checkedConfig yml;
 
   cmdlineArgs = cfg.extraFlags ++ [
-    "--config.file ${alertmanagerYml}"
+    "--config.file /tmp/alert-manager-substituted.yaml"
     "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
     "--log.level ${cfg.logLevel}"
     ] ++ (optional (cfg.webExternalUrl != null)
@@ -127,6 +127,16 @@ in {
           Extra commandline options when launching the Alertmanager.
         '';
       };
+
+      environmentFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/root/alertmanager.env";
+        description = ''
+          File to load as environment file. Useful to insert secrets
+          into the configuration (via envsubst).
+        '';
+      };
     };
   };
 
@@ -144,9 +154,14 @@ in {
       systemd.services.alertmanager = {
         wantedBy = [ "multi-user.target" ];
         after    = [ "network.target" ];
+        preStart = ''
+           ${lib.getBin pkgs.envsubst}/bin/envsubst -o /tmp/alert-manager-substituted.yaml" \
+                                                    -i ${alertmanagerYml}"
+        '';
         serviceConfig = {
           Restart  = "always";
-          DynamicUser = true;
+          DynamicUser = true; # implies PrivateTmp
+          EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
           WorkingDirectory = "/tmp";
           ExecStart = "${cfg.package}/bin/alertmanager" +
             optionalString (length cmdlineArgs != 0) (" \\\n  " +

From ab6eebbe204836d04614ff70aa5f4f1d34ab0569 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Jan 2020 17:30:34 +0100
Subject: [PATCH 518/755] =?UTF-8?q?ocamlPackages.batteries:=202.10.0=20?=
 =?UTF-8?q?=E2=86=92=202.11.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index b0ad12dad677..1b3bb9a79812 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
 
-let version = "2.10.0"; in
+let version = "2.11.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-batteries-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
-    sha256 = "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h";
+    sha256 = "0swdnm9c3sd3yzzyg7yh1lkqhfikmga4fzx2416ja1q62nv26j53";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];

From 52d5ce38fb84d23ab446fbeaecacf05177ae269e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <christian.hoppner@serokell.io>
Date: Sun, 29 Dec 2019 12:00:35 +0000
Subject: [PATCH 519/755] nixos/amazon-init.nix: add git to amazon-init script
 PATH

---
 nixos/modules/virtualisation/amazon-init.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 826c78a6e7ff..d65aec0ee9fd 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -7,7 +7,7 @@ let
     echo "attempting to fetch configuration from EC2 user data..."
 
     export HOME=/root
-    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
+    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data
@@ -48,7 +48,7 @@ in {
     wantedBy = [ "multi-user.target" ];
     after = [ "multi-user.target" ];
     requires = [ "network-online.target" ];
- 
+
     restartIfChanged = false;
     unitConfig.X-StopOnRemoval = false;
 
@@ -58,4 +58,3 @@ in {
     };
   };
 }
-

From 6d6869980992e2a7b35fd3dbef501bcedee161b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <christian.hoppner@serokell.io>
Date: Tue, 31 Dec 2019 12:21:19 +0000
Subject: [PATCH 520/755] nixos/amazon-init.nix: Add gnutar to amazon-init PATH

---
 nixos/modules/virtualisation/amazon-init.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index d65aec0ee9fd..fc9ff160660b 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -7,7 +7,7 @@ let
     echo "attempting to fetch configuration from EC2 user data..."
 
     export HOME=/root
-    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
+    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data

From 94899871b8d3243dee7fbdb7639212a3d11aa7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <christian.hoppner@serokell.io>
Date: Fri, 3 Jan 2020 20:21:58 +0000
Subject: [PATCH 521/755] nixos/amazon-init.nix: Add gzip to amazon-init path

---
 nixos/modules/virtualisation/amazon-init.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index fc9ff160660b..8c12e0e49bf5 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -7,7 +7,7 @@ let
     echo "attempting to fetch configuration from EC2 user data..."
 
     export HOME=/root
-    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
+    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data

From 4da3513960e3477b8fa2fa34469cb783a6cf20aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <christian.hoppner@serokell.io>
Date: Fri, 3 Jan 2020 22:07:59 +0000
Subject: [PATCH 522/755] Pass on nixos configuration to amazonImage

---
 nixos/release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index f40b5fa9bd7f..9109f5751eb5 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -209,7 +209,8 @@ in rec {
     hydraJob ((import lib/eval-config.nix {
       inherit system;
       modules =
-        [ versionModule
+        [ configuration
+          versionModule
           ./maintainers/scripts/ec2/amazon-image.nix
         ];
     }).config.system.build.amazonImage)

From 6930a1602c861216f99a37d17b7368dffa5420cc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Jan 2020 14:32:22 +0100
Subject: [PATCH 523/755] matrix-synapse: 1.8.0 -> 1.9.0

https://github.com/matrix-org/synapse/releases/tag/v1.9.0
---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index baff593c0e3c..608ac6028f41 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dkx53hxafqjs05g240zna2v3l3ndpa4y4z5x85v8dvv5zkibdxz";
+    sha256 = "0ghmxzk2njid7d7ccggda8a9zx4dg1r59n5ymp8f2n9kxz7z2rj2";
   };
 
   patches = [

From 88a7f65c834ec09ce9df0c23c9935630e17a0c4a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 22 Jan 2020 23:22:23 +0100
Subject: [PATCH 524/755] lib/cli: unexport symbols & sort with generators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lib/cli is very similar to generators, so it should follow largely the
same interface. Similar to how generators isn’t exported, we should
also namespace cli by default (plus “cli” is only three characters to
type).
---
 lib/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 5abafe1b2acf..45530d47a532 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -37,11 +37,13 @@ let
     licenses = callLibs ./licenses.nix;
     systems = callLibs ./systems;
 
+    # serialization
+    cli = callLibs ./cli.nix;
+    generators = callLibs ./generators.nix;
+
     # misc
     asserts = callLibs ./asserts.nix;
-    cli = callLibs ./cli.nix;
     debug = callLibs ./debug.nix;
-    generators = callLibs ./generators.nix;
     misc = callLibs ./deprecated.nix;
 
     # domain-specific
@@ -121,7 +123,6 @@ let
       isOptionType mkOptionType;
     inherit (asserts)
       assertMsg assertOneOf;
-    inherit (cli) encodeGNUCommandLine toGNUCommandLine;
     inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
       traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal

From 582354d3b6161384cf69a90f6c00d7e29382950a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 22 Jan 2020 23:24:06 +0100
Subject: [PATCH 525/755] lib/cli: encodeGNUCommandLine ->
 toGNUCommandLineShell
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The semantic difference between `encode` and `to` is not apparent.
Users are likely to confuse both functions (which leads to unexpected
error messages about the wrong types). Like in `generators.nix`, all
functions should be prefixed by `to`.

Furthermore, converting to a string depends on the target context. In
this case, it’s a POSIX shell, so we should name it that (compare
`escapeShellArg` in `strings.nix`).

We can later add versions that escape for embedding in e.g. python
scripts or similar.
---
 lib/cli.nix        | 26 ++++++++++++++++++++++++--
 lib/tests/misc.nix | 29 +++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lib/cli.nix b/lib/cli.nix
index f47625d2f537..32d24a00ceb0 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -6,8 +6,29 @@ rec {
      This helps protect against malformed command lines and also to reduce
      boilerplate related to command-line construction for simple use cases.
 
+     `toGNUCommandLine` returns a list of nix strings.
+     `toGNUCommandLineShell` returns an escaped shell string.
+
      Example:
-       encodeGNUCommandLine
+       toGNUCommandLine
+         { }
+         { data = builtins.toJSON { id = 0; };
+
+           X = "PUT";
+
+           retry = 3;
+
+           retry-delay = null;
+
+           url = [ "https://example.com/foo" "https://example.com/bar" ];
+
+           silent = false;
+
+           verbose = true;
+         };
+       => [ "-X" "PUT" "--data" "{\"id\":0}" "--retry" "3" "--url" "https://example.com/foo" "--url" "https://example.com/bar" "--verbose" ]
+
+       toGNUCommandLineShell
          { }
          { data = builtins.toJSON { id = 0; };
 
@@ -24,8 +45,9 @@ rec {
            verbose = true;
          };
        => "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"
+
   */
-  encodeGNUCommandLine =
+  toGNUCommandLineShell =
     options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
 
   toGNUCommandLine =
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index e47b48b5017d..b320839b2ac7 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -441,9 +441,34 @@ runTests {
     expected  = "«foo»";
   };
 
-  testRenderOptions = {
+
+# CLI
+
+  testToGNUCommandLine = {
     expr =
-       encodeGNUCommandLine
+       cli.toGNUCommandLine
+         { }
+         { data = builtins.toJSON { id = 0; };
+
+           X = "PUT";
+
+           retry = 3;
+
+           retry-delay = null;
+
+           url = [ "https://example.com/foo" "https://example.com/bar" ];
+
+           silent = false;
+
+           verbose = true;
+         };
+
+    expected = [ "-X" "PUT" "--data" "{\"id\":0}" "--retry" "3" "--url" "https://example.com/foo" "--url" "https://example.com/bar" "--verbose" ];
+  };
+
+  testToGNUCommandLineShell = {
+    expr =
+       cli.toGNUCommandLineShell
          { }
          { data = builtins.toJSON { id = 0; };
 

From 6841f408cc7f42e3eaa59b06351008da2b1aa270 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 22 Jan 2020 23:31:58 +0100
Subject: [PATCH 526/755] CODEOWNERS: add Profpatsch to /lib/cli.nix and
 /lib/asserts.nix

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0c06c59f3780..f3ac8ad96b7c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,7 +14,9 @@
 /lib                        @edolstra @nbp @infinisil
 /lib/systems                @nbp @ericson2314 @matthewbauer
 /lib/generators.nix         @edolstra @nbp @Profpatsch
+/lib/cli.nix                @edolstra @nbp @Profpatsch
 /lib/debug.nix              @edolstra @nbp @Profpatsch
+/lib/asserts.nix            @edolstra @nbp @Profpatsch
 
 # Nixpkgs Internals
 /default.nix                          @nbp

From b2654c226a83aa4cf5948f04ea6370796a2c7055 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 22 Jan 2020 23:37:10 +0100
Subject: [PATCH 527/755] lib/cli,lib/tests/misc: somewhat more standard
 formatting

---
 lib/cli.nix        | 76 +++++++++++++++++++++-------------------------
 lib/tests/misc.nix | 61 ++++++++++++++++---------------------
 2 files changed, 61 insertions(+), 76 deletions(-)

diff --git a/lib/cli.nix b/lib/cli.nix
index 32d24a00ceb0..a0e85c396057 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -10,49 +10,44 @@ rec {
      `toGNUCommandLineShell` returns an escaped shell string.
 
      Example:
-       toGNUCommandLine
-         { }
-         { data = builtins.toJSON { id = 0; };
-
-           X = "PUT";
-
-           retry = 3;
-
-           retry-delay = null;
-
-           url = [ "https://example.com/foo" "https://example.com/bar" ];
-
-           silent = false;
-
-           verbose = true;
-         };
-       => [ "-X" "PUT" "--data" "{\"id\":0}" "--retry" "3" "--url" "https://example.com/foo" "--url" "https://example.com/bar" "--verbose" ]
-
-       toGNUCommandLineShell
-         { }
-         { data = builtins.toJSON { id = 0; };
-
-           X = "PUT";
-
-           retry = 3;
-
-           retry-delay = null;
-
-           url = [ "https://example.com/foo" "https://example.com/bar" ];
-
-           silent = false;
-
-           verbose = true;
-         };
-       => "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"
+       cli.toGNUCommandLine {} {
+         data = builtins.toJSON { id = 0; };
+         X = "PUT";
+         retry = 3;
+         retry-delay = null;
+         url = [ "https://example.com/foo" "https://example.com/bar" ];
+         silent = false;
+         verbose = true;
+       }
+       => [
+         "-X" "PUT"
+         "--data" "{\"id\":0}"
+         "--retry" "3"
+         "--url" "https://example.com/foo"
+         "--url" "https://example.com/bar"
+         "--verbose"
+       ]
 
+       cli.toGNUCommandLineShell {} {
+         data = builtins.toJSON { id = 0; };
+         X = "PUT";
+         retry = 3;
+         retry-delay = null;
+         url = [ "https://example.com/foo" "https://example.com/bar" ];
+         silent = false;
+         verbose = true;
+       }
+       => "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";
   */
   toGNUCommandLineShell =
     options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
 
   toGNUCommandLine =
     { renderKey ?
-        key: if builtins.stringLength key == 1 then "-${key}" else "--${key}"
+        key:
+          if builtins.stringLength key == 1
+          then "-${key}"
+          else "--${key}"
 
     , renderOption ?
         key: value:
@@ -66,11 +61,10 @@ rec {
     }:
     options:
       let
-        render = key: value:
-                 if builtins.isBool value
-            then renderBool key value
-            else if builtins.isList value
-            then renderList key value
+        render =
+          key: value:
+            if      builtins.isBool value then renderBool key value
+            else if builtins.isList value then renderList key value
             else renderOption key value;
 
       in
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index b320839b2ac7..59ed1e507e24 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -445,45 +445,36 @@ runTests {
 # CLI
 
   testToGNUCommandLine = {
-    expr =
-       cli.toGNUCommandLine
-         { }
-         { data = builtins.toJSON { id = 0; };
+    expr = cli.toGNUCommandLine {} {
+      data = builtins.toJSON { id = 0; };
+      X = "PUT";
+      retry = 3;
+      retry-delay = null;
+      url = [ "https://example.com/foo" "https://example.com/bar" ];
+      silent = false;
+      verbose = true;
+    };
 
-           X = "PUT";
-
-           retry = 3;
-
-           retry-delay = null;
-
-           url = [ "https://example.com/foo" "https://example.com/bar" ];
-
-           silent = false;
-
-           verbose = true;
-         };
-
-    expected = [ "-X" "PUT" "--data" "{\"id\":0}" "--retry" "3" "--url" "https://example.com/foo" "--url" "https://example.com/bar" "--verbose" ];
+    expected = [
+      "-X" "PUT"
+      "--data" "{\"id\":0}"
+      "--retry" "3"
+      "--url" "https://example.com/foo"
+      "--url" "https://example.com/bar"
+      "--verbose"
+    ];
   };
 
   testToGNUCommandLineShell = {
-    expr =
-       cli.toGNUCommandLineShell
-         { }
-         { data = builtins.toJSON { id = 0; };
-
-           X = "PUT";
-
-           retry = 3;
-
-           retry-delay = null;
-
-           url = [ "https://example.com/foo" "https://example.com/bar" ];
-
-           silent = false;
-
-           verbose = true;
-         };
+    expr = cli.toGNUCommandLineShell {} {
+      data = builtins.toJSON { id = 0; };
+      X = "PUT";
+      retry = 3;
+      retry-delay = null;
+      url = [ "https://example.com/foo" "https://example.com/bar" ];
+      silent = false;
+      verbose = true;
+    };
 
     expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";
   };

From e71e1be8590e0f0dcac66e8b1e09695b94362fbd Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 22 Jan 2020 23:55:42 +0100
Subject: [PATCH 528/755] lib/cli: rename `renderX` options to `mkX`

Mirrors the naming scheme in `generators.nix`, for consistency.

Also rename `key` to `k` and value to `v` to aid readability to the
code structure.
---
 lib/cli.nix | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/cli.nix b/lib/cli.nix
index a0e85c396057..067ee21696ab 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -43,29 +43,26 @@ rec {
     options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
 
   toGNUCommandLine =
-    { renderKey ?
-        key:
-          if builtins.stringLength key == 1
-          then "-${key}"
-          else "--${key}"
+    { mkKey ?
+        k: if builtins.stringLength k == 1
+           then "-${k}"
+           else "--${k}"
 
-    , renderOption ?
-        key: value:
-          if value == null
-          then []
-          else [ (renderKey key) (builtins.toString value) ]
+    , mkOption ?
+        k: v: if v == null
+              then []
+              else [ (mkKey k) (builtins.toString v) ]
 
-    , renderBool ? key: value: lib.optional value (renderKey key)
+    , mkBool ? k: v: lib.optional v (mkKey k)
 
-    , renderList ? key: value: lib.concatMap (renderOption key) value
+    , mkList ? k: v: lib.concatMap (mkOption k) v
     }:
     options:
       let
-        render =
-          key: value:
-            if      builtins.isBool value then renderBool key value
-            else if builtins.isList value then renderList key value
-            else renderOption key value;
+        render = k: v:
+          if      builtins.isBool v then mkBool k v
+          else if builtins.isList v then mkList k v
+          else mkOption k v;
 
       in
         builtins.concatLists (lib.mapAttrsToList render options);

From 18520b7f3658f2007c7cbfcaea43edf2becdbb86 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 23 Jan 2020 01:07:02 +0100
Subject: [PATCH 529/755] lib/generators: floats are not supported in
 mkValueStringDefault

They are cut off after a few decimal places; we cannot in good faith
define a default string representation with that.
---
 lib/generators.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/generators.nix b/lib/generators.nix
index a71654bec6c3..a64e94bd5cbd 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -46,7 +46,10 @@ rec {
     else if isList     v then err "lists" v
     # same as for lists, might want to replace
     else if isAttrs    v then err "attrsets" v
+    # functions can’t be printed of course
     else if isFunction v then err "functions" v
+    # let’s not talk about floats. There is no sensible `toString` for them.
+    else if isFloat    v then err "floats" v
     else err "this value is" (toString v);
 
 

From 7228a3c0bcd80e24a18881b11048d3713042f256 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 23 Jan 2020 01:09:55 +0100
Subject: [PATCH 530/755] lib/cli: mkKey -> mkOptionName, use
 generators.mkValueStringDefault
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let’s call them by what they are, option names.

`generators.mkValueStringDefault` is a better value string renderer
than plain `toString`.

Also add docs to all options.
---
 lib/cli.nix | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/cli.nix b/lib/cli.nix
index 067ee21696ab..c96d4dbb0432 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -42,20 +42,34 @@ rec {
   toGNUCommandLineShell =
     options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
 
-  toGNUCommandLine =
-    { mkKey ?
-        k: if builtins.stringLength k == 1
-           then "-${k}"
-           else "--${k}"
+  toGNUCommandLine = {
+    # how to string-format the option name;
+    # by default one character is a short option (`-`),
+    # more than one characters a long option (`--`).
+    mkOptionName ?
+      k: if builtins.stringLength k == 1
+          then "-${k}"
+          else "--${k}",
 
-    , mkOption ?
-        k: v: if v == null
-              then []
-              else [ (mkKey k) (builtins.toString v) ]
+    # how to format a boolean value to a command list;
+    # by default it’s a flag option
+    # (only the option name if true, left out completely if false).
+    mkBool ? k: v: lib.optional v (mkOptionName k),
 
-    , mkBool ? k: v: lib.optional v (mkKey k)
+    # how to format a list value to a command list;
+    # by default the option name is repeated for each value
+    # and `mkOption` is applied to the values themselves.
+    mkList ? k: v: lib.concatMap (mkOption k) v,
 
-    , mkList ? k: v: lib.concatMap (mkOption k) v
+    # how to format any remaining value to a command list;
+    # on the toplevel, booleans and lists are handled by `mkBool` and `mkList`,
+    # though they can still appear as values of a list.
+    # By default, everything is printed verbatim and complex types
+    # are forbidden (lists, attrsets, functions). `null` values are omitted.
+    mkOption ?
+      k: v: if v == null
+            then []
+            else [ (mkOptionName k) (lib.generators.mkValueStringDefault {} v) ]
     }:
     options:
       let

From 4dbba7a1432918e0da05ae494e90e59c515b7cf7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 09:00:00 -0500
Subject: [PATCH 531/755] procs: 0.8.16 -> 0.9.0

---
 pkgs/tools/admin/procs/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 20e9c8b3d47a..46eec85b1bf7 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -4,27 +4,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.8.16";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l4n3gr1sc7wfa21p8yh7idaii0mnfpyqp4cg7f9l4345isy94vq";
+    sha256 = "1lprxfy733rs39fg8yif3p8vz9szk7d529ahn1kn70zm8i3mqpch";
   };
 
-  cargoSha256 = "03c63dlzvag341n6la1s61ccri1avlprd91m11z9zzjhi9b46kcr";
+  cargoSha256 = "11l2dggvkk2vx4xap2q02qrr576i4mswf67plhg23azr43fpi0r5";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-  patches = [
-    # Fix tests on darwin. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/dalance/procs/commit/bb554e247b5b339bc00fa5dd2e771b0d7cb09cd5.patch";
-      sha256 = "1szvvifa4pdbgdsmdj5f0zq6qzf1lh6wwc6ipawblfzwmg7d9wvk";
-    })
-  ];
-
   meta = with stdenv.lib; {
     description = "A modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";

From 89f80c0a907292df86779a0d62adda894ba598ec Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Tue, 21 Jan 2020 19:30:56 +0100
Subject: [PATCH 532/755] maintainers: add kraem

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a63968e172ee..fc9c724ad352 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3812,6 +3812,12 @@
     githubId = 787421;
     name = "Kevin Quick";
   };
+  kraem = {
+    email = "me@kraem.xyz";
+    github = "kraem";
+    githubId = 26622971;
+    name = "Ronnie Ebrin";
+  };
   kragniz = {
     email = "louis@kragniz.eu";
     github = "kragniz";

From 6c868ddda32a24cc3b541e89ec9a8e5088a59eff Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Thu, 23 Jan 2020 10:04:54 -0600
Subject: [PATCH 533/755] renderizer: init at 2.0.5 (#78326)

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

diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix
new file mode 100644
index 000000000000..f33cad8da7a2
--- /dev/null
+++ b/pkgs/development/tools/renderizer/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "renderizer";
+  version = "2.0.5";
+
+  src = fetchFromGitHub {
+    owner = "gomatic";
+    repo = pname;
+    rev = version;
+    sha256 = "186wcfzw60z6i59yl37rkppw8w88z5kikvsi65k4r9kwpll2z6z4";
+  };
+
+  modSha256 = "1sxg9skd5hjpg2f4wyxh5hwjrplw3b3v32gn61a9yixfk3wvi05x";
+
+  meta = with stdenv.lib; {
+    description = "CLI to render Go template text files";
+    inherit (src.meta) homepage;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ yurrriq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bf7da13c36a..a2b7cce26b53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25235,6 +25235,8 @@ in
 
   redprl = callPackage ../applications/science/logic/redprl { };
 
+  renderizer = pkgs.callPackage ../development/tools/renderizer {};
+
   retroarchBare = callPackage ../misc/emulators/retroarch {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) AppKit Foundation;

From f2c9bcf0094958cdc7fcb7e7abc2df25d5cd513d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 23 Jan 2020 20:39:33 +0300
Subject: [PATCH 534/755] nixos/unit: fix attrs

---
 nixos/modules/services/web-servers/unit/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix
index b0b837cd1929..f8a18954fc99 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixos/modules/services/web-servers/unit/default.nix
@@ -130,8 +130,10 @@ in {
     };
 
     users.users = optionalAttrs (cfg.user == "unit") {
-      unit.group = cfg.group;
-      isSystemUser = true;
+      unit = {
+        group = cfg.group;
+        isSystemUser = true;
+      };
     };
 
     users.groups = optionalAttrs (cfg.group == "unit") {

From 65ff43e8662fb02bccada5542147d80920ebfccb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 23 Jan 2020 17:49:00 +0000
Subject: [PATCH 535/755] doc: Fix callout reference in appimagetools

---
 doc/builders/images/appimagetools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/builders/images/appimagetools.xml b/doc/builders/images/appimagetools.xml
index 37e4251cda2e..0767a509a43d 100644
--- a/doc/builders/images/appimagetools.xml
+++ b/doc/builders/images/appimagetools.xml
@@ -80,7 +80,7 @@ appimageTools.wrapType2 { # or wrapType1
      <varname>src</varname> specifies the AppImage file to extract.
     </para>
    </callout>
-   <callout arearefs='ex-appimageTools-wrapping-2'>
+   <callout arearefs='ex-appimageTools-wrapping-3'>
     <para>
      <varname>extraPkgs</varname> allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
      <itemizedlist>

From 65862d21402735da0a39ec1d0990e55fb8c8baf4 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 19 Jan 2020 22:54:59 +0100
Subject: [PATCH 536/755] dasher: init at 2018-04-03

---
 .../accessibility/dasher/default.nix          | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/accessibility/dasher/default.nix

diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix
new file mode 100644
index 000000000000..9e8084e7a87a
--- /dev/null
+++ b/pkgs/applications/accessibility/dasher/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, lib, fetchFromGitHub
+, autoreconfHook, pkgconfig, wrapGAppsHook
+, glib, gtk3, expat, gnome-doc-utils, which
+, at-spi2-core, dbus
+, libxslt, libxml2
+, speechSupport ? true, speechd ? null
+}:
+
+assert speechSupport -> speechd != null;
+
+stdenv.mkDerivation {
+  pname = "dasher";
+  version = "2018-04-03";
+
+  src = fetchFromGitHub {
+    owner = "dasher-project";
+    repo = "dasher";
+    rev = "9ab12462e51d17a38c0ddc7f7ffe1cb5fe83b627";
+    sha256 = "1r9xn966nx3pv2bidd6i3pxmprvlw6insnsb38zabmac609h9d9s";
+  };
+
+  prePatch = ''
+    # tries to invoke git for something, probably fetching the ref
+    echo "true" > build-aux/mkversion
+  '';
+
+  configureFlags = lib.optional (!speechSupport) "--disable-speech";
+
+  nativeBuildInputs = [
+    autoreconfHook
+    wrapGAppsHook
+    pkgconfig
+    # doc generation
+    gnome-doc-utils
+    which
+    libxslt libxml2
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    expat
+    # at-spi2 needs dbus to be recognized by pkg-config
+    at-spi2-core dbus
+  ] ++ lib.optional speechSupport speechd;
+
+  meta = {
+    homepage = http://www.inference.org.uk/dasher/;
+    description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.Profpatsch ];
+    platforms = lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2b7cce26b53..a1268532fae2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1536,6 +1536,8 @@ in
 
   dante = callPackage ../servers/dante { };
 
+  dasher = callPackage ../applications/accessibility/dasher { };
+
   datamash = callPackage ../tools/misc/datamash { };
 
   datasette = with python3Packages; toPythonApplication datasette;

From 166d8247d0852f26449c29a0967ba15af600cdea Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 19 Jan 2020 22:55:21 +0100
Subject: [PATCH 537/755] modules/at-spi2-core: add debugging help to
 description

This makes the error message greppable.
---
 nixos/modules/services/desktops/gnome3/at-spi2-core.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index cca98c43dc7a..8fa108c4f9df 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -18,6 +18,9 @@ with lib;
         description = ''
           Whether to enable at-spi2-core, a service for the Assistive Technologies
           available on the GNOME platform.
+
+          Enable this if you get the error or warning
+          <literal>The name org.a11y.Bus was not provided by any .service files</literal>.
         '';
       };
 

From 67509cc831f2372e69c546d87fdba3bd4e4ef08f Mon Sep 17 00:00:00 2001
From: chris <grkcharge@gmail.com>
Date: Thu, 23 Jan 2020 10:34:48 -0800
Subject: [PATCH 538/755] Updated the terraform providers

---
 .../cluster/terraform-providers/data.nix      | 240 +++++++++---------
 1 file changed, 120 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index cd37083d9359..b78ab3f6ddaa 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -12,9 +12,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      rev     = "v1.63.0";
-      version = "1.63.0";
-      sha256  = "0353zsga4ic7rsgnk243v202l4hpy0xlzp95fnbmrz7p5wy2k8js";
+      rev     = "v1.70.1";
+      version = "1.70.1";
+      sha256  = "19bhnnw5gh4pqap8y23v57lyk27z7fw1wb4p0faj860kdf2zpq4j";
     };
   archive =
     {
@@ -44,9 +44,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      rev     = "v2.41.0";
-      version = "2.41.0";
-      sha256  = "0i9bh78ihmxj7hjbqzkkj7k6lvr3xdakf8qv0bfckcinwpzwzbxa";
+      rev     = "v2.45.0";
+      version = "2.45.0";
+      sha256  = "0416f32wy88zyagnwcf2flh1rh7i118b9h5qn8fwrm3sv43p3blm";
     };
   azuread =
     {
@@ -60,9 +60,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      rev     = "v1.37.0";
-      version = "1.37.0";
-      sha256  = "0n0582v8g3np8glyxnpnayps014jxclzrglcxf35wszfz9mspryg";
+      rev     = "v1.41.0";
+      version = "1.41.0";
+      sha256  = "0ma291m9d452wavjr3lgyik01r8napmwz91bbnbfzp1j48hhqc4h";
     };
   azurestack =
     {
@@ -76,9 +76,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-bigip";
-      rev     = "v1.1.0";
-      version = "1.1.0";
-      sha256  = "15fmxr1c39xx6ix38nigf8izrqzlmjjr6hvlkf7yhb5z7485nvsg";
+      rev     = "v1.1.1";
+      version = "1.1.1";
+      sha256  = "15rx25fbvdmgvg5n0qnq1hyfnr7l4nx8igdb4107g41fp73bxg32";
     };
   bitbucket =
     {
@@ -108,9 +108,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-circonus";
-      rev     = "v0.4.0";
-      version = "0.4.0";
-      sha256  = "0iz7v7gfjgbca47vjnvcv9159kgladkad7cmjw2hpncrn2jjinwg";
+      rev     = "v0.5.0";
+      version = "0.5.0";
+      sha256  = "0m6xbmgbismsmxnh79xb9p3mvy9aqdwvmsvifpxsbd73lki232mc";
     };
   clc =
     {
@@ -124,17 +124,17 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudflare";
-      rev     = "v2.1.0";
-      version = "2.1.0";
-      sha256  = "1ll06p4fz88mr4a51rqgvxykivx9xina6507mflyxaic59xlkdz4";
+      rev     = "v2.3.0";
+      version = "2.3.0";
+      sha256  = "031xb0g1g74gc44nadbgrfn59hzjr5q0s98lgxrglsdm5mfgzdfr";
     };
   cloudscale =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudscale";
-      rev     = "v2.1.0";
-      version = "2.1.0";
-      sha256  = "12vxzhpsivvq343mqkmnwklvnv6dc9h2ah0ixla9svdwjp91xfcd";
+      rev     = "v2.1.1";
+      version = "2.1.1";
+      sha256  = "122yi2wbd8mqddkwp2la6vwqw0kw7c9ff5j6y4xqczjg2bwb9mph";
     };
   cloudstack =
     {
@@ -156,25 +156,25 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-consul";
-      rev     = "v2.6.0";
-      version = "2.6.0";
-      sha256  = "1c7qpgf2vh4crs69alzwwaicsz29b2y72x4xjmfb9dg5cy7gk1i5";
+      rev     = "v2.6.1";
+      version = "2.6.1";
+      sha256  = "17lgfanz3by7wfrgqbwbsbxs46mrr8a1iyqkj38qc8xg0m6pg97v";
     };
   datadog =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      rev     = "v2.5.0";
-      version = "2.5.0";
-      sha256  = "0l5jix165ghfj72l3mr76d5b5lx5pgr45zimk8lr0fwn79f4bs74";
+      rev     = "v2.6.0";
+      version = "2.6.0";
+      sha256  = "05ijf01sxdxrxc3ii68ha8b6x8pz025kfa51i91q42ldhf3kqhsz";
     };
   digitalocean =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-digitalocean";
-      rev     = "v1.11.0";
-      version = "1.11.0";
-      sha256  = "0s8z0zsfibclx0431fcqbi9yqkhwj4w0rz780z1dwv50xpgnmzql";
+      rev     = "v1.12.0";
+      version = "1.12.0";
+      sha256  = "137p8q30pv28h5gfqag0i44dxbc1dbq239gnzbb4hkzgsqgrb9gp";
     };
   dme =
     {
@@ -228,49 +228,49 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-fastly";
-      rev     = "v0.11.0";
-      version = "0.11.0";
-      sha256  = "0wq8l1lkfpv5nfd04dsjaa9wv09373i6wwnapifx1wncjyhs4jd4";
+      rev     = "v0.12.1";
+      version = "0.12.1";
+      sha256  = "1bczp7rdbpmycbky9ijirfix2capw0hjai4c7w5hmm4wda5spwb1";
     };
   flexibleengine =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-flexibleengine";
-      rev     = "v1.9.0";
-      version = "1.9.0";
-      sha256  = "1y66xy5yqdjdrh3zkw1q7ml5b2rsyy4ayc4m026c4mmh0x1vfk9y";
+      rev     = "v1.10.0";
+      version = "1.10.0";
+      sha256  = "1ys1dd7knfk3hic6ph4gi7qsf75s2m5mxkil16p3f9ywvfxpzq8w";
     };
   github =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-github";
-      rev     = "v2.2.1";
-      version = "2.2.1";
-      sha256  = "1dg5jgd3cdz98wfd71l58wsp949mvs2lrcqh1amgql0s90pwjmvg";
+      rev     = "v2.3.0";
+      version = "2.3.0";
+      sha256  = "02fd6rq25ms9lpjqn4n1wy13i2mnl9lvczpgjqlz69yj2aiwyw34";
     };
   gitlab =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-gitlab";
-      rev     = "v2.4.0";
-      version = "2.4.0";
-      sha256  = "0409n8miva205wkx968ggzmz0y121s99iybsjlkx0gja20x68yxx";
+      rev     = "v2.5.0";
+      version = "2.5.0";
+      sha256  = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf";
     };
   google =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      rev     = "v2.20.0";
-      version = "2.20.0";
-      sha256  = "1b19hql244lv74gxdwgqh9955d3zkwj7riaq6kj5ylbj44spcpjy";
+      rev     = "v3.5.0";
+      version = "3.5.0";
+      sha256  = "09mlic67940bnq5f8a7magn27k2jm8hvq3z0zh2cv6a9gdpg821i";
     };
   google-beta =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google-beta";
-      rev     = "v2.20.0";
-      version = "2.20.0";
-      sha256  = "0zkhyn17kji6yyl5582g5vhqj3rcbin73ym6vn6f0m7sf5yaplky";
+      rev     = "v3.5.0";
+      version = "3.5.0";
+      sha256  = "1qkfvvidvb2j76x095vprj2vm272lig38a8rbxsir2kkvkmnzv5l";
     };
   grafana =
     {
@@ -324,9 +324,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-huaweicloud";
-      rev     = "v1.10.0";
-      version = "1.10.0";
-      sha256  = "0aa83y0bzfldijd4jbmhqppc13jdqaax83p75kffwaxw1rmxrana";
+      rev     = "v1.12.0";
+      version = "1.12.0";
+      sha256  = "1wcr1d9y6bnwjh6b0a49i566wyn0d8bjnxnpgmd4s6wmr9sc4l0b";
     };
   icinga2 =
     {
@@ -340,9 +340,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ignition";
-      rev     = "v1.2.0";
-      version = "1.2.0";
-      sha256  = "0dg5xak02rv7h9z07kjqxf55al188ligzq3m6711rlh62zam2cjc";
+      rev     = "v1.2.1";
+      version = "1.2.1";
+      sha256  = "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql";
     };
   influxdb =
     {
@@ -428,9 +428,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-newrelic";
-      rev     = "v1.8.0";
-      version = "1.8.0";
-      sha256  = "16fdif6hshdb1aswv22k590rcr3f6b3a9gmg8vc4lbyi6l2dfabd";
+      rev     = "v1.12.1";
+      version = "1.12.1";
+      sha256  = "17xdwhiyzfjxirvjwwl5jnan84i3zd930zch8l4jx04946vjzsc5";
     };
   nomad =
     {
@@ -444,9 +444,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ns1";
-      rev     = "v1.6.1";
-      version = "1.6.1";
-      sha256  = "0zyn165h42p640k1q85x3n8fw1fs9j72z9lnfa8pas89jy2fmi8b";
+      rev     = "v1.6.4";
+      version = "1.6.4";
+      sha256  = "08wg5qlqj7id5gfwxckjyx1ypfkiq919vjzq8qsdayg9sr9dpf5i";
     };
   nsxt =
     {
@@ -476,9 +476,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      rev     = "v3.54.0-rc1";
-      version = "3.54.0-rc1";
-      sha256  = "14mfkjjpq4sfw0j4w1mnh37x9kwn76rs1y6cjqq9zb8fnhva6gax";
+      rev     = "v3.59.0-rc1";
+      version = "3.59.0-rc1";
+      sha256  = "1pgl95rmxk9h9whbkfgpzpbvvkhnm3223flqk73w673ylgrxss49";
     };
   oneandone =
     {
@@ -500,25 +500,25 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      rev     = "v1.24.0";
-      version = "1.24.0";
-      sha256  = "1w82ix6l6ad7q0zl00hys8c4gm27nnk12wm2n8i3prwpjnrar70m";
+      rev     = "v1.25.0";
+      version = "1.25.0";
+      sha256  = "1yqc7nhmzlcq48csn23ma3fv6yb6cmkqqrxv63jjg6bxb7nyyqxd";
     };
   opentelekomcloud =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opentelekomcloud";
-      rev     = "v1.14.0";
-      version = "1.14.0";
-      sha256  = "1mjb6br8iy76q417lmg04xnv4hkgi2fgdn3qnr3nvlwnnccp230k";
+      rev     = "v1.15.0";
+      version = "1.15.0";
+      sha256  = "080lzs40m3vny5bmg4vhsy7qz884c44ysmh325hi6s3v76dv4jxg";
     };
   opsgenie =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opsgenie";
-      rev     = "v0.2.5";
-      version = "0.2.5";
-      sha256  = "0brjqnlnxqss285n2g1z006bibbdh5v47g75l5kyhyhhchavccma";
+      rev     = "v0.2.7";
+      version = "0.2.7";
+      sha256  = "0yylf5iv1dba9naqys65l5whym3q0bwpn98dwxr0lyj0skr8nz7r";
     };
   oraclepaas =
     {
@@ -532,17 +532,17 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ovh";
-      rev     = "v0.5.0";
-      version = "0.5.0";
-      sha256  = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw";
+      rev     = "v0.6.0";
+      version = "0.6.0";
+      sha256  = "0hj029q9j2751hnay0rh0c8yxgmv2wd6xjwi12gkj6k6rmpgqfdh";
     };
   packet =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      rev     = "v2.7.1";
-      version = "2.7.1";
-      sha256  = "1hmja9c8ab66yr814psz1zsa4y0nbmd5rcnp3qxdgizp45yrvz3i";
+      rev     = "v2.7.3";
+      version = "2.7.3";
+      sha256  = "1dd9fa416crh5y61qyaj2l0jhn1kh0ndkzqdw3lsxjqdhcqppbns";
     };
   pagerduty =
     {
@@ -556,25 +556,25 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-panos";
-      rev     = "v1.6.1";
-      version = "1.6.1";
-      sha256  = "06hwi426x7ipmn4dbg5dyv9z84sxaa8q1jlcd2l264n9s2y3xhiq";
+      rev     = "v1.6.2";
+      version = "1.6.2";
+      sha256  = "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5";
     };
   postgresql =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-postgresql";
-      rev     = "v1.3.0";
-      version = "1.3.0";
-      sha256  = "14ma5lm6ng52dfl8bl4rmpy8ylnkbvnbskvkr6r5sn28x51p601y";
+      rev     = "v1.4.0";
+      version = "1.4.0";
+      sha256  = "162j6dyrbc9r4ipj6igj64wm6r65l4vb0dlwczfhlksix3qzr3kx";
     };
   powerdns =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-powerdns";
-      rev     = "v1.2.0";
-      version = "1.2.0";
-      sha256  = "1108hq4z4is305hnbkn95gv0f5lx5l27wvxvq0g03fcdqdimkrfn";
+      rev     = "v1.3.0";
+      version = "1.3.0";
+      sha256  = "0in8f9vfi9y71qac643lfgapbnxi40cwq9b3l82fl1r8ghg7kgri";
     };
   profitbricks =
     {
@@ -588,17 +588,17 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-rabbitmq";
-      rev     = "v1.1.0";
-      version = "1.1.0";
-      sha256  = "0xihc44923kx8c3v6wrvczzbhmbjkhy7dhgx3sy5sqhmm22y0gys";
+      rev     = "v1.2.0";
+      version = "1.2.0";
+      sha256  = "1lhra8dvfyi6gn4s8mjd3lkkj6bz8y7xjhw1ki2kl5vpfw79d4l9";
     };
   rancher =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-rancher";
-      rev     = "v1.4.0";
-      version = "1.4.0";
-      sha256  = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc";
+      rev     = "v1.5.0";
+      version = "1.5.0";
+      sha256  = "0yhv9ahj6ajspgnl2f77gpyd6klq44dyl74lvl10bx6yy56abi2m";
     };
   random =
     {
@@ -636,9 +636,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      rev     = "v1.12.0";
-      version = "1.12.0";
-      sha256  = "0044fq5jkdx2ryc2bxqajkrngs6z81kd2narg4zxvfn0r1bfswvc";
+      rev     = "v1.13.0";
+      version = "1.13.0";
+      sha256  = "085wv59cfsaac2373gn783lknzp4qmgnrgi2yl1g27znm4b940i7";
     };
   selectel =
     {
@@ -652,9 +652,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-skytap";
-      rev     = "v0.11.1";
-      version = "0.11.1";
-      sha256  = "1mlv6jp6lp47chcnsmx8dzy01bxpb9jx1wl122lxd88app9nxq1k";
+      rev     = "v0.13.0";
+      version = "0.13.0";
+      sha256  = "1why3ipi5a7whf18z87f97lbzdj020hfp8gxpgzl0nwpzpwkhdz3";
     };
   softlayer =
     {
@@ -700,9 +700,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tencentcloud";
-      rev     = "v1.25.2";
-      version = "1.25.2";
-      sha256  = "1pf4l9rvkarl4vhf51np4kdqcgs4jhsr5gw7vs6rn8gv97lb40kw";
+      rev     = "v1.30.1";
+      version = "1.30.1";
+      sha256  = "0gy7c3w217yzysv9hyrsw3q452g0iba9z72iijyfwcqm79gw3208";
     };
   terraform =
     {
@@ -716,9 +716,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tfe";
-      rev     = "v0.11.1";
-      version = "0.11.1";
-      sha256  = "0iagddaivpd7cxgf8ha2pk0m66gi4a804s86fsxla0j1knmmyra0";
+      rev     = "v0.11.4";
+      version = "0.11.4";
+      sha256  = "0ls5736cwshj3z1wgpbcma6bml9p45k5g7hm530bmqdxsamxfj1m";
     };
   tls =
     {
@@ -740,9 +740,9 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ucloud";
-      rev     = "v1.14.1";
-      version = "1.14.1";
-      sha256  = "04vi87q2fhy907l7rwsbq5p6l9vm6avm1hbf9qwddkbxx2kjjf64";
+      rev     = "v1.15.1";
+      version = "1.15.1";
+      sha256  = "1djlpjig8y6x149r6f21x7y3p49fjvrxx7pbs2fpsyv437zff9vj";
     };
   ultradns =
     {
@@ -756,33 +756,33 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      rev     = "v2.6.0";
-      version = "2.6.0";
-      sha256  = "0sw1swy2j9n3ji48sxmj093zzlq7sdmp8ixmz488ps3m4jjyfk6k";
+      rev     = "v2.7.1";
+      version = "2.7.1";
+      sha256  = "1lvpgdyi8qk1bvz9i1wml22mmm5ga8kf413xmpj966wvxqsgw6z5";
     };
   vcd =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vcd";
-      rev     = "v2.5.0";
-      version = "2.5.0";
-      sha256  = "0h78ij9rkx43i9kdcfy7waa6xyn2j40zgm6im3zp0yswy6vjlcyq";
+      rev     = "v2.6.0";
+      version = "2.6.0";
+      sha256  = "0f7c5l05h0xcq51yaqpx1v3lg4wmysszayysvcspipiwzrhx5cmg";
     };
   vsphere =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      rev     = "v1.13.0";
-      version = "1.13.0";
-      sha256  = "10gl042l5mlmklhjjknwln1qcwl65xz8sbg1acyv8xkb6nsaxcf1";
+      rev     = "v1.15.0";
+      version = "1.15.0";
+      sha256  = "1hxzxkqphm00gp0d1s32xn0knxgf5vg05nq68ba3q27wpx4ipanl";
     };
   yandex =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-yandex";
-      rev     = "v0.24.0";
-      version = "0.24.0";
-      sha256  = "0a9isivn3ni0d1id8ww97xbcwrxc0c4pn1m1q21cipqs6mwksq9m";
+      rev     = "v0.28.0";
+      version = "0.28.0";
+      sha256  = "1ml96cqjvxzapb76fpblgl6ak15idv3jj5wcs9ix0dr6i2fdfwpc";
     };
   segment =
     {

From 8c54c8240a4a7cf806b6becdcb14f2778dea2a90 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Thu, 23 Jan 2020 10:55:29 -0800
Subject: [PATCH 539/755] frama-c: 19.1 -> 20.0

---
 pkgs/development/tools/analysis/frama-c/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 701db7a158fc..7d24bf5e0d57 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -23,12 +23,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "frama-c";
-  version = "19.1";
-  slang   = "Potassium";
+  version = "20.0";
+  slang   = "Calcium";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
-    sha256 = "16xsc4jv3ycs5dqprpkh9isr6l2w6i4bq83msqmkdc7l7hf53vrd";
+    sha256 = "03dvn162djylj2skmk6vv75gh87mm4s5cspkzcrlm5x0rlla2yqn";
   };
 
   preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";

From 3f46a4afab8a40d3ae32e179112a416f1c4aaae5 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Thu, 23 Jan 2020 21:10:57 +0200
Subject: [PATCH 540/755] remmina: 1.3.9 -> 1.3.10

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

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 6a75f600f1ce..de221fce3896 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "remmina";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchFromGitLab {
     owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "1nkfxiajan43cf6yjn3blkv1pi5v7wkvh33gj84q4afvdbxvbcg4";
+    sha256 = "0gc7b88129avl9sbax3ncvm7zf2qvq35ixvvpr2zj74g3qnphl08";
   };
 
   nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];

From f4131d260d9f884c83d8b0e394137bf62be96436 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 23 Jan 2020 15:03:34 -0500
Subject: [PATCH 541/755] cernlib: add src mirror url

---
 pkgs/development/libraries/physics/cernlib/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index 2a1846e40a64..bd43ae442043 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   pname = "cernlib";
 
   src = fetchurl {
-    url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
+    urls = [
+      "https://ftp.riken.jp/cernlib/download/${version}_source/tar/${version}_src.tar.gz"
+      "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"
+    ];
     sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky";
   };
 

From f4b4c66a0838bebc9b8bfe17b93e29b288f893f3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 22 Jan 2020 09:58:10 -0800
Subject: [PATCH 542/755] steam: use 64-bit libva

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

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 9229f4fbc93e..fd3219d479c8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -75,7 +75,7 @@ in buildFHSUserEnv rec {
     xorg.libX11
     xorg.libXfixes
     libGL
-    pkgsi686Linux.libva
+    libva
 
     # Not formally in runtime but needed by some games
     at-spi2-atk

From 04bf042e2f57f6e9d452cc3ed05c5c341b00b2ea Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Tue, 21 Jan 2020 19:35:22 +0100
Subject: [PATCH 543/755] rar2fs: init at 1.28.0

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

diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix
new file mode 100644
index 000000000000..996e3c52ec29
--- /dev/null
+++ b/pkgs/tools/filesystems/rar2fs/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, fuse
+, unrar
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rar2fs";
+  version = "1.28.0";
+
+  src = fetchFromGitHub {
+    owner = "hasse69";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0fmdqrs5yvn89ngc26vj5ggnalpwrdm8pdcfszw1wflh78hvd8kb";
+  };
+
+  postPatch = ''
+    substituteInPlace get-version.sh \
+      --replace "which echo" "echo"
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ fuse unrar ];
+
+  configureFlags = [
+    "--with-unrar=${unrar.dev}/include/unrar"
+    "--disable-static-unrar"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "FUSE file system for reading RAR archives";
+    homepage = https://hasse69.github.io/rar2fs/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ kraem ];
+    platforms = with platforms; linux ++ freebsd;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36bfc03a8785..2c765655c5a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2958,6 +2958,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  rar2fs = callPackage ../tools/filesystems/rar2fs { };
+
   s-tar = callPackage ../tools/archivers/s-tar {};
 
   sonota = callPackage ../tools/misc/sonota { };

From 983f39cdabc774f299e1ea0d75ee3475a55384cc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 23 Jan 2020 18:31:23 +0100
Subject: [PATCH 544/755] unrar: Install all C++ header files into the "dev"
 output

This is e.g. required for the rar2fs build [0], which needs at least
version.hpp, rar.hpp, dllext.hpp, dll.hpp, and headers5.hpp.

At least Gentoo does this as well [1] but most other distributions only
install dll.hpp or no header files at all.

[0]: https://github.com/NixOS/nixpkgs/pull/78189
[1]: https://gitweb.gentoo.org/repo/gentoo.git/tree/app-arch/unrar/unrar-5.8.5.ebuild
---
 pkgs/tools/archivers/unrar/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 0fe8f2f58665..62fd02ac56d7 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     make lib
   '';
 
+  outputs = [ "out" "dev" ];
+
   installPhase = ''
     install -Dt "$out/bin" unrar
 
@@ -30,7 +32,8 @@ stdenv.mkDerivation rec {
         $out/share/doc/unrar
 
     install -Dm755 libunrar.so $out/lib/libunrar.so
-    install -D dll.hpp $out/include/unrar/dll.hpp
+
+    install -Dt $dev/include/unrar/ *.hpp
   '';
 
   setupHook = ./setup-hook.sh;

From da5bb025c6a942ec21edb3d1d2c84d5dfef0b901 Mon Sep 17 00:00:00 2001
From: vasile luta <elsile69@yahoo.com>
Date: Wed, 8 Jan 2020 10:46:14 +0200
Subject: [PATCH 545/755] rsyslog: include libmaxminddb

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

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 7c5b9a189667..9d3cbbf79ebf 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -4,6 +4,7 @@
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
 , liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
 , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
+, libmaxminddb ? null
 }:
 
 with stdenv.lib;
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
     fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
     postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
-    rabbitmq-c hiredis mongoc
+    rabbitmq-c hiredis mongoc libmaxminddb
   ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
     ++ stdenv.lib.optional stdenv.isLinux systemd;
 
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
     (mkFlag true                      "rsyslogd")
     (mkFlag true                      "mail")
     (mkFlag (liblognorm != null)      "mmnormalize")
+    (mkFlag (libmaxminddb != null)    "mmdblookup")
     (mkFlag true                      "mmjsonparse")
     (mkFlag true                      "mmaudit")
     (mkFlag true                      "mmanon")

From be692c4c29b29d4ae9d2e139be1ec9f906e5d963 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Thu, 23 Jan 2020 22:24:32 +0200
Subject: [PATCH 546/755] rsyslog-light: remove libmaxminddb

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1268532fae2..6a6b7a1f599d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2133,6 +2133,7 @@ in
     czmq = null;
     rabbitmq-c = null;
     hiredis = null;
+    libmaxminddb = null;
   };
 
   mar1d = callPackage ../games/mar1d { } ;
@@ -7591,7 +7592,7 @@ in
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
-  
+
   zsh-bd = callPackage ../shells/zsh/zsh-bd { };
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };

From fece3e5ca1f58c6a4c00df86130f2e1ea206142c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 23 Jan 2020 18:47:17 +0000
Subject: [PATCH 547/755] doc: Remove comment advising to install build tooling
 system-wide

We should not encourage installing build-tooling system-wide but
instead promote nix-shell.
---
 doc/languages-frameworks/rust.section.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 0edf03ad26a9..3332dff1eb07 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -16,12 +16,6 @@ cargo
 into the `environment.systemPackages` or bring them into
 scope with `nix-shell -p rustc cargo`.
 
-> If you are using NixOS and you want to use rust without a nix expression you
-> probably want to add the following in your `configuration.nix` to build
-> crates with C dependencies.
->
->     environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
-
 For daily builds (beta and nightly) use either rustup from
 nixpkgs or use the [Rust nightlies
 overlay](#using-the-rust-nightlies-overlay).

From 0d97ef510bdc9d66f1023f970be58fdab2eb87fa Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 23 Jan 2020 23:51:05 +0100
Subject: [PATCH 548/755] tdesktop: 1.9.4 -> 1.9.7 (#78390)

This also properly enables the spell checking with enchant2.

Note: This requires a proper configuration.
A quick and dirty solution (not recommended) could look like this:
install -Dt ~/.config/enchant/hunspell/ $(nix-build -A hunspellDicts.en_US)/share/hunspell/en_US.{aff,dic}
---
 .../telegram/tdesktop/default.nix                  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 25ee992cb6c8..66dab786b7c1 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -18,34 +18,35 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.4";
+  version = "1.9.7";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1ldsgbix0ca4pl2z55wiz90ll3542zsm9slayrzyr7b2jw7arxwy";
+    sha256 = "1hj7bv11alc8cfffy0k3za4missdr44cdmia93xn77w012qjn8a4";
   };
 
   # Arch patches (svn export telegram-desktop/trunk)
   archPatches = fetchsvn {
     url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    rev = "553350";
-    sha256 = "05fyij490flrbn4jfwhm8gx9imh0wfby4j9fj69f45qgkpsd7ajb";
+    rev = "554983";
+    sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j";
   };
 
   # Note: It would be best if someone could get as many patches upstream as
   # possible (we currently depend a lot on custom patches...).
   patches = [
     "${archPatches}/0005-Use-system-wide-fonts.patch"
-    "${archPatches}/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch"
   ];
 
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
       --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+    substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
+      --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
   '';
 
   # We want to run wrapProgram manually (with additional parameters)
@@ -90,6 +91,7 @@ mkDerivation rec {
     "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
     "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
     #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
+    "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
   ];
 
   # Note: The following packages could be packaged system-wide, but it's
@@ -108,7 +110,7 @@ mkDerivation rec {
   # https://github.com/NixOS/nixpkgs/pull/75210
 
   installPhase = ''
-    install -Dm755 bin/Telegram $out/bin/telegram-desktop
+    install -Dm755 bin/telegram-desktop $out/bin/telegram-desktop
 
     mkdir -p $out/share/{kservices5,applications,metainfo}
     sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol"

From bfa278ee5ad569860f9bd41e4b5ee8626087a849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 23 Jan 2020 19:18:25 +0000
Subject: [PATCH 549/755] nixos/knot: set defaultText for package option

the package attributes looks nicer in the manual
---
 nixos/modules/services/networking/knot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix
index 1cc1dd3f2f62..47364ecb8464 100644
--- a/nixos/modules/services/networking/knot.nix
+++ b/nixos/modules/services/networking/knot.nix
@@ -56,6 +56,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.knot-dns;
+        defaultText = "pkgs.knot-dns";
         description = ''
           Which Knot DNS package to use
         '';
@@ -92,4 +93,3 @@ in {
     environment.systemPackages = [ knot-cli-wrappers ];
   };
 }
-

From 2685806371b53ada17107df8f734a6d2b7a39718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 23 Jan 2020 19:19:14 +0000
Subject: [PATCH 550/755] nixos/kresd: add listenDoH option

---
 nixos/modules/services/networking/kresd.nix | 34 ++++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 5eb50a13ca9a..bb941e93e150 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -5,12 +5,15 @@ with lib;
 let
 
   cfg = config.services.kresd;
-  package = pkgs.knot-resolver;
+  configFile = pkgs.writeText "kresd.conf" ''
+    ${optionalString (cfg.listenDoH != []) "modules.load('http')"}
+    ${cfg.extraConfig};
+  '';
 
-  configFile = pkgs.writeText "kresd.conf" cfg.extraConfig;
-in
-
-{
+  package = pkgs.knot-resolver.override {
+    extraFeatures = cfg.listenDoH != [];
+  };
+in {
   meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
 
   imports = [
@@ -67,6 +70,15 @@ in
         For detailed syntax see ListenStream in man systemd.socket.
       '';
     };
+    listenDoH = mkOption {
+      type = with types; listOf str;
+      default = [];
+      example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ];
+      description = ''
+        Addresses and ports on which kresd should provide DNS over HTTPS (see RFC 7858).
+        For detailed syntax see ListenStream in man systemd.socket.
+      '';
+    };
     # TODO: perhaps options for more common stuff like cache size or forwarding
   };
 
@@ -104,6 +116,18 @@ in
       };
     };
 
+    systemd.sockets.kresd-doh = mkIf (cfg.listenDoH != []) rec {
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      partOf = [ "kresd.socket" ];
+      listenStreams = cfg.listenDoH;
+      socketConfig = {
+        FileDescriptorName = "doh";
+        FreeBind = true;
+        Service = "kresd.service";
+      };
+    };
+
     systemd.sockets.kresd-control = rec {
       wantedBy = [ "sockets.target" ];
       before = wantedBy;

From c857a24d2e08da60c1661e857a5595f4e05f14c0 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Wed, 22 Jan 2020 14:28:59 +0100
Subject: [PATCH 551/755] aws-sam-cli: 0.34.0 -> 0.40.0

---
 .../development/tools/aws-sam-cli/default.nix | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 43cb26a30d86..39a68622056a 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -24,6 +24,29 @@ let
         doCheck = false;
       });
 
+      cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec {
+        version = "1.6.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk";
+        };
+      });
+
+      boto3 = super.boto3.overridePythonAttrs (oldAttrs: rec {
+        version = "1.10.50";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "199nr61ivm4bychn3rxyzzyca5f8wlwags3s43rdv9yn048xa02w";
+        };
+      });
+
+      botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
+        version = "1.13.50";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "1m3lbi13d9gcp6wfhv0pkwg8akasxlhv49y34ybj74ppgximqnkn";
+        };
+      });
     };
   };
 
@@ -33,11 +56,11 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "0.34.0";
+  version = "0.40.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ndgcbd6zr23lvmqn4wikgvnlwl0gj0wgyawaspwm3b0jlvxadik";
+    sha256 = "1vlg5fdkq5xr4v3a86gyxbbrx4rzdspbv62ki7q8yq8xdja1qz05";
   };
 
   # Tests are not included in the PyPI package

From c3ccac15eb0afb1730e995748167d5e34038ccdb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 20:20:20 -0500
Subject: [PATCH 552/755] libredirect: fix build on darwin

Fix build failure on darwin due to absence of `O_TMPFILE`.
---
 pkgs/build-support/libredirect/libredirect.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index d31b7551e949..e7f74c736ab0 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -61,7 +61,11 @@ static const char * rewrite(const char * path, char * buf)
 
 static int open_needs_mode(int flags)
 {
+#ifdef O_TMPFILE
     return (flags & O_CREAT) || (flags & O_TMPFILE) == O_TMPFILE;
+#else
+    return flags & O_CREAT;
+#endif
 }
 
 /* The following set of Glibc library functions is very incomplete -

From 109f179e445f73e5740028cffd2e44741dcdb5e8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 23 Jan 2020 20:31:04 -0500
Subject: [PATCH 553/755] buildbot: 2.5.1 -> 2.6.0 (#78335)

---
 pkgs/development/python-modules/buildbot/default.nix |  4 ++--
 pkgs/development/python-modules/buildbot/pkg.nix     |  4 ++--
 pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++-----
 pkgs/development/python-modules/buildbot/worker.nix  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index e627667f3ec2..611cb5ad5ffe 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.5.1";
+    version = "2.6.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "13ddpcbndb22zlg9gjsf2pbgad45g1w5cg4a3z83085fkgnib7sr";
+      sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index ff2be45bf32a..4f3a0ea04b8f 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "buildbot-pkg";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g87pddsyas1r0f6z29047cwnz7ds4925f6n9g7b0pkj3k73ci06";
+    sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 8722a6629e49..4bb82b598568 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "00k5dbcwzqlyk4lcp5qh1q8xbrxmg9gzqs7vl2r6f3wxi4ydb5nw";
+      sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg";
     };
 
     # Remove unneccessary circular dependency on buildbot
@@ -36,7 +36,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0ai334y779jwqabrn2yjma41pw0a9k1qy7v68qbjd22n4my227ma";
+      sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -58,7 +58,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1j450hwvg729mivzijbrx8ngalx56qvrx8mwwgy8arfwpnyfkr9l";
+      sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -80,7 +80,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "19w8is5s7d7l60mlchh1zd9nidpkswi8fivfa36b97plibn0jgw1";
+      sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -102,7 +102,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1zl7y08rkw7bya6cli44msvcdgirsyfg3kxpf2z82vwgc6bwi785";
+      sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 048fb44a93bc..6352b22b55d6 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage (rec {
   pname = "buildbot-worker";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kpj85x8xflrccvy840v9bl3q1j63rk9kahj1qirbai1fxwvzbik";
+    sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l";
   };
 
   propagatedBuildInputs = [ twisted future ];

From e206c375503266e23ff66b9dc078cd499b2edc53 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 23 Jan 2020 21:22:55 -0500
Subject: [PATCH 554/755] R: Update CRAN and bioconductor packages

---
 pkgs/development/r-modules/bioc-packages.nix |   14 +-
 pkgs/development/r-modules/cran-packages.nix | 3468 +++++++++---------
 pkgs/development/r-modules/default.nix       |   23 -
 3 files changed, 1760 insertions(+), 1745 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index a849ec0c0262..a85290708fc5 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -370,7 +370,7 @@ in with self; {
   GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.4.0"; sha256="0xcj10r85hxh5qy43cjb6ypd849b5wphhhv528simxq4glhgrhxp"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
   GraphAT = derive2 { name="GraphAT"; version="1.54.0"; sha256="1xfd0i0j1fai58c15mc3lrg2jc4iwswyfpyg0ff5hnyhmgr3wnsa"; depends=[graph MCMCpack]; };
   GraphAlignment = derive2 { name="GraphAlignment"; version="1.46.0"; sha256="1qql33ikps9x0dkvc31sxvyf8w119ax7519v5bv35s3i5yxh16i6"; depends=[]; };
-  GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC RMallow TSP]; };
+  GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC TSP]; };
   GreyListChIP = derive2 { name="GreyListChIP"; version="1.14.0"; sha256="1hsjv4r88ldb7pgl5a3im8vdhmbiaj0rrn0clij7jfh5p5r81r1r"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
   Guitar = derive2 { name="Guitar"; version="1.20.1"; sha256="1d4j54jdnsi8gi6p0kk6zxkk6kzd1r1k77mw142xlvh8b6zrl3nq"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
   Gviz = derive2 { name="Gviz"; version="1.26.5"; sha256="1dpkcaar7qgzg3vgafvkplprhwmhzpb7ph009kr6ajm36hx4z81c"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
@@ -457,7 +457,7 @@ in with self; {
   M3C = derive2 { name="M3C"; version="1.4.1"; sha256="0l9063bn0sfcq5qxghaj8f98x0pg91fwsd8l64ga8d7pnlm8i5fm"; depends=[cluster dendextend doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer Rtsne sigclust survival]; };
   M3D = derive2 { name="M3D"; version="1.16.0"; sha256="0a7xs3kqvyxswsa4zcdakij4rvpv1pr4fmplnvxyskhh2zps7xyl"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; };
   M3Drop = derive2 { name="M3Drop"; version="1.8.1"; sha256="0bzxv4lnmbz4d7y1c2w7i013rfjscnj1ndb05k9n1i4c9gsknqya"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
-  MACPET = derive2 { name="MACPET"; version="1.2.0"; sha256="0799d3pr5b6g7xbi75pf693768nspdc73qay72naghyql6g91s96"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr rbamtools Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; };
+  MACPET = derive2 { name="MACPET"; version="1.2.0"; sha256="0799d3pr5b6g7xbi75pf693768nspdc73qay72naghyql6g91s96"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; };
   MADSEQ = derive2 { name="MADSEQ"; version="1.8.0"; sha256="1b7d6niz8lhvd17xjl4hy1yyki049cg6wd3g8wp38bm3zs6dzfd1"; 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.2.3"; sha256="1d2lllsz2jdqma1ifdg7xj9fby85az7bifn0h0hj705m6dyla42z"; depends=[biomaRt bladderbatch clusterProfiler data_table DOSE ggExtra ggplot2 ggrepel ggsci gridExtra pathview pheatmap png sva]; };
   MAIT = derive2 { name="MAIT"; version="1.16.1"; sha256="0fg3cah81c4gzm3hw590h4grrja2qgfs8mrpkbifrgsclbybnp95"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
@@ -479,7 +479,7 @@ in with self; {
   MIGSA = derive2 { name="MIGSA"; version="1.6.0"; sha256="19gfb98qmb8wbi343lw92sf7d29xliyzb3wz095pd2npsjr69qkl"; 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.20.1"; sha256="0vj7z95pjq62glg1akipydbybxsxc69yjpqrffpc33kqhf46nhfb"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
   MIRA = derive2 { name="MIRA"; version="1.4.1"; sha256="0wy4iisp6c0kfns34pr5am055b1x7wdnbdh8lgr5ll91wxz48sg9"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
-  MLInterfaces = derive2 { name="MLInterfaces"; version="1.62.1"; sha256="1h0x1p2h8x1h276wxx6kcnb4c4s5sglnmd58iigl81a224x8gxwp"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
+  MLInterfaces = derive2 { name="MLInterfaces"; version="1.62.1"; sha256="1h0x1p2h8x1h276wxx6kcnb4c4s5sglnmd58iigl81a224x8gxwp"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rpart sfsmisc shiny threejs]; };
   MLP = derive2 { name="MLP"; version="1.30.0"; sha256="03h7k5v620x2hw6k3gddaba40fwh6zvpmlnhf6mcml7ldsni95y9"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
   MLSeq = derive2 { name="MLSeq"; version="2.0.1"; sha256="1jaw2blnl7jsd2px069af7zqk69d04bma8m5vpqb941vx6yhk095"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma plyr sSeq SummarizedExperiment xtable]; };
   MMDiff2 = derive2 { name="MMDiff2"; version="1.10.0"; sha256="0ljdr6y3plzpf9j70ghw41x3jpb8p52lqb9987gm1mw7lxw9iraf"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
@@ -538,7 +538,7 @@ in with self; {
   NADfinder = derive2 { name="NADfinder"; version="1.6.1"; sha256="0kz7dz95kdz5dz05bh7x6czrwdr1imaq1mv6bncxxhv1mffhmb9v"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
   NBSplice = derive2 { name="NBSplice"; version="1.0.6"; sha256="1nalcpj7n4qghmkrfq65xd4i0aack2yq4l2wwsy4z0sfi7gh6m49"; depends=[BiocParallel car edgeR ggplot2 MASS mppa reshape2]; };
   NCIgraph = derive2 { name="NCIgraph"; version="1.30.0"; sha256="16mxxrq6g4szig29cah2a13qp1ybsh8ci37izlq6gpxn0h00maym"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; };
-  NGScopy = derive2 { name="NGScopy"; version="1.16.1"; sha256="1zfasfbzzay402igag1ynffz2v9ad70wdy5vs02q0api3rkkn406"; depends=[changepoint rbamtools Xmisc]; };
+  NGScopy = derive2 { name="NGScopy"; version="1.16.1"; sha256="1zfasfbzzay402igag1ynffz2v9ad70wdy5vs02q0api3rkkn406"; depends=[changepoint Xmisc]; };
   NOISeq = derive2 { name="NOISeq"; version="2.26.1"; sha256="1wyhhi9ydlbjlz427093mdp5ppby77n37w5c2iyxlpsdk2m2nqsn"; depends=[Biobase Matrix]; };
   NTW = derive2 { name="NTW"; version="1.32.0"; sha256="10ndg6mina5wz3w87wpv4mnbxdyj6rhvc9jqf954wmh6gj04vyin"; depends=[mvtnorm]; };
   NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.12.0"; sha256="1927ry931ckjrci6yfk3fh774bizh4yb5f7p7x1ra1yxzfizq7k3"; depends=[Biobase matrixStats Rcpp]; };
@@ -798,7 +798,7 @@ in with self; {
   TFutils = derive2 { name="TFutils"; version="1.2.0"; sha256="1gppabscwfbqyvwrnl7mppw9wp528plp3bxq7g73hhgackfwnwkc"; depends=[dplyr magrittr miniUI shiny]; };
   TIN = derive2 { name="TIN"; version="1.14.0"; sha256="0n5lx8pg066z9adjsfnslxw6fv0w0ibv7nk2yz8qaiq6zivvcc1y"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
   TMixClust = derive2 { name="TMixClust"; version="1.4.0"; sha256="03i9fgq29xr3h72c2scb4fa6305l7bpwj6hgk0j1v7ark6xz5xqz"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
-  TPP = derive2 { name="TPP"; version="3.10.1"; sha256="00rfxhzamz45phav239xki8jy9bj7f0r03wrl9d09ir5amis271p"; 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]; };
+  TPP = derive2 { name="TPP"; version="3.10.1"; sha256="00rfxhzamz45phav239xki8jy9bj7f0r03wrl9d09ir5amis271p"; 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 stringr tidyr VennDiagram VGAM]; };
   TRONCO = derive2 { name="TRONCO"; version="2.14.2"; sha256="1cqkk6zsfsjpq8iidvmpfvkfak3ryp2bl9p04in0sn8sl9is6nsq"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
   TSCAN = derive2 { name="TSCAN"; version="1.20.0"; sha256="1yas32djld4dlsmzi65dflmnrff48m7vb6j7wgr44jip416mh7l1"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
   TSRchitect = derive2 { name="TSRchitect"; version="1.8.9"; sha256="0i5i7m2rfqgnr2n39hfdgbvlhm8aqa6c77i7jvp66lapskww4rgb"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
@@ -1558,7 +1558,7 @@ in with self; {
   spikeLI = derive2 { name="spikeLI"; version="2.42.0"; sha256="055zbrbh6wf3vvnc9p8px2ffz9wdhdg0h96260r7c72ax3v6wi5g"; depends=[]; };
   spkTools = derive2 { name="spkTools"; version="1.38.0"; sha256="0rm2vlzid3wjm1g1kzmjklga1gcf852aznhxb1xr50v8drivkkz9"; depends=[Biobase gtools RColorBrewer]; };
   splatter = derive2 { name="splatter"; version="1.6.1"; sha256="1kw9shzqwph44q2fksgp79mrjq23j3806clc4xydw3ys2w4kspj8"; depends=[akima BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
-  spliceSites = derive2 { name="spliceSites"; version="1.30.0"; sha256="1j40awy9irx53d1cdsx52pnxirjrrvgsj9zx5qhl2556ca65l26n"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
+  spliceSites = derive2 { name="spliceSites"; version="1.30.0"; sha256="1j40awy9irx53d1cdsx52pnxirjrrvgsj9zx5qhl2556ca65l26n"; depends=[Biobase BiocGenerics Biostrings doBy IRanges seqLogo]; };
   splicegear = derive2 { name="splicegear"; version="1.54.0"; sha256="0phpkgjkc4c8lfr8xsciqyz7imsjpc3sxwsh95glxhrsm7i2mnip"; depends=[annotate Biobase XML]; };
   splineTimeR = derive2 { name="splineTimeR"; version="1.10.0"; sha256="15dzhijkhpy7d8hwif59bic83fk6fnyjpp4qi7y7vwq139j6yaj2"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
   splots = derive2 { name="splots"; version="1.48.0"; sha256="0s10ha17p4yf6id0h0r0a2fk992jp4ah7v8ani689zy6pcc0w34d"; depends=[RColorBrewer]; };
@@ -1581,7 +1581,7 @@ in with self; {
   switchBox = derive2 { name="switchBox"; version="1.18.0"; sha256="1s49vi0vyh0bmrc6marn69hi9ln12j3kyjkkm2z5fpvv3rvxhgw7"; depends=[gplots pROC]; };
   switchde = derive2 { name="switchde"; version="1.8.1"; sha256="1ydc9h62iyfz0786c5zhz3189p2f7sf3z6fjlvqwjqxva5j0f12b"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; };
   synapter = derive2 { name="synapter"; version="2.6.1"; sha256="19rf8kkqf070ldhnrdi3xl23j2slv4qadw9cx8wvc4p994f2abj9"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; };
-  synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; };
+  synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2]; };
   synlet = derive2 { name="synlet"; version="1.12.1"; sha256="13rghqqbkxni121ds0slf6cnj2g5zbm3sbbcli95z7mxy2wn3syg"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
   systemPipeR = derive2 { name="systemPipeR"; version="1.16.1"; sha256="0qzydz87rld2nhwzbfgrw5jfgh8maa9y54mjx9c4285m11qj2shq"; 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="1.0.0"; sha256="1kzl79q0zim9y7px0dirk41qay96nl2bz8sw76nx56pr1d5jh245"; depends=[assertive BiocGenerics Biostrings GenomicRanges ggplot2 IRanges S4Vectors scales stringr XVector]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 8099944156b4..6dbb19fcb694 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 = "2019-12-03"; };
+let derive2 = derive { snapshot = "2020-01-22"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; };
@@ -46,7 +46,7 @@ in with self; {
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
   AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.2-2"; sha256="0kpdl31wmwk5i4cqcwlm66c9s0c2b793army9dx50hdgrrzqc0na"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
-  AID = derive2 { name="AID"; version="2.4"; sha256="1r29kf2vnh1jhrhx22a176xbvhxjn12pcvdb7x3bd6qw5q3z2l0d"; depends=[ggplot2 MASS nortest psych tseries]; };
+  AID = derive2 { name="AID"; version="2.5"; sha256="0il6qjv1gcbxdf1lknsfij4vxzc31qyp359abqzdvkzyxwgbbzsy"; depends=[ggplot2 MASS nortest psych tseries]; };
   AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; };
   AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
   ALA4R = derive2 { name="ALA4R"; version="1.7.0"; sha256="1vprq3w8pzla2ffsalpqgzkdv8wqialr45sq0qa0xjdlsrdwxipp"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; };
@@ -55,7 +55,7 @@ in with self; {
   ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
   ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
   ALSM = derive2 { name="ALSM"; version="0.2.0"; sha256="1g7zk8q462j4faq5wzzghkjc003ny6rj8hrymsgvh3fg3a72lvy3"; depends=[car leaps SuppDists]; };
-  ALTopt = derive2 { name="ALTopt"; version="0.1.1"; sha256="0frpnycnljz6r24cg4z99ivm3rbg9j1nxfkhw18vbrb7gcl1hqj6"; depends=[cubature lattice]; };
+  ALTopt = derive2 { name="ALTopt"; version="0.1.2"; sha256="1nbbvniramajg6k83xqgx7r0abjrfja8zz0y3g3j8qmvbcqmjx13"; depends=[cubature lattice]; };
   ALassoSurvIC = derive2 { name="ALassoSurvIC"; version="0.1.0"; sha256="0q02rz947bp6i7sbb5nzxq8ky74iprdnpbwnmnn7vg29vhca4b09"; depends=[Rcpp]; };
   AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
   AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; };
@@ -75,8 +75,8 @@ in with self; {
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.4"; sha256="0rq4aphjmqrr4pm55vpc8qr4rghqkmlsqsvxzarx3kmr3aqlmqg8"; depends=[quadprog shiny]; };
   APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; };
   APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; };
-  APIS = derive2 { name="APIS"; version="0.1.0"; sha256="1kpf766b6mvig9gj9zhjgpr2yvbjinjrhzxv1109fv3igabzjxd9"; depends=[doParallel foreach ggplot2 gridExtra]; };
-  APML0 = derive2 { name="APML0"; version="0.9"; sha256="1scvcrcsjgdrq9gfv8qxbd703k76cyk01ml93bcr8j8kiwv05z0f"; depends=[Matrix Rcpp RcppEigen]; };
+  APIS = derive2 { name="APIS"; version="1.0.0"; sha256="1lifc1nlksprb9zjmirxkgjddd56avbp6dli93yqr9d81xasrp5p"; depends=[doParallel foreach ggplot2 gridExtra]; };
+  APML0 = derive2 { name="APML0"; version="0.10"; sha256="1l6mw1mqb7qnsvfv9w6yydqjsrwrsrqx3bpifyp43cf2q71yx5gp"; depends=[Matrix Rcpp RcppEigen]; };
   APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; };
   APSIM = derive2 { name="APSIM"; version="0.9.3"; sha256="1pqyy170h2s0kv7nf9v6xr8lgp8yh4psnmpi0naghjg7h72bl53k"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
@@ -87,7 +87,7 @@ in with self; {
   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-1"; sha256="086i2isgi65r0sanyisdwiwdca0v7hvi1bcvsmwdbwbcgqr1zh0b"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat]; };
+  AROC = derive2 { name="AROC"; version="1.0-2"; sha256="1a7nxspq9kbzji417mr49i0s19ms8wyq48qz7rnlw1mrkipl4p6d"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat]; };
   ARPobservation = derive2 { name="ARPobservation"; version="1.2.0"; sha256="1kgflalpymbsfzwg4c70mdxgrbsg8r8z44433v3y9rymhfyq9nmj"; 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]; };
@@ -104,7 +104,7 @@ in with self; {
   ASSOCShiny = derive2 { name="ASSOCShiny"; version="0.1.0"; sha256="1g1ba9d5ywd3gbwjb36xnms8l15dg1vwc6r0nsb5adhpb602xsw1"; depends=[arules arulesViz dplyr plotly rmarkdown shiny shinyMatrix]; };
   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]; };
+  ATR = derive2 { name="ATR"; version="0.1-1"; sha256="0via7zm3byzbdgrfw351fqvx0g5cj2z31bqfwh7kr99nqgjh0dyn"; depends=[partykit]; };
   ATmet = derive2 { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
   AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
   AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
@@ -124,7 +124,6 @@ in with self; {
   ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; };
   ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; };
   ActivePathways = derive2 { name="ActivePathways"; version="1.0.1"; sha256="1xb0d1svmzw404pv8ja6wr4773k7x2lxkrzrayilvzqbfzj1wx20"; depends=[data_table ggplot2 metap]; };
-  ActivityIndex = derive2 { name="ActivityIndex"; version="0.3.6"; sha256="14k6d78s15j7kb7jhixf4msrdjdl28d0r264cbvy41p8dkq7ysvk"; depends=[data_table matrixStats R_utils]; };
   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]; };
   AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; };
@@ -149,7 +148,7 @@ in with self; {
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; };
   AlphaPart = derive2 { name="AlphaPart"; version="0.7.0"; sha256="1bqwbjqmazjgmdpk5s0i3dl4hb3qhz2sy1drhazmgdxhf5qwsq85"; depends=[directlabels gdata ggplot2 pedigree quadprog Rcpp reshape]; };
-  AlphaSimR = derive2 { name="AlphaSimR"; version="0.11.0"; sha256="0p3a1rrgd8h02x79g49144igj6g58nnqb6bf7h4cwvjc2033w5si"; depends=[BH R6 Rcpp RcppArmadillo]; };
+  AlphaSimR = derive2 { name="AlphaSimR"; version="0.11.1"; sha256="0j8sw9pcxc1qbv6phcs92inyx6hwdfy05ww0y1a5dga39lap1r57"; 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.6"; sha256="1shvc8x1kmb0cincgggsv5c5w25k36kqvisdqd3ayy5g98vqvh33"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
@@ -157,12 +156,11 @@ in with self; {
   AmigaFFH = derive2 { name="AmigaFFH"; version="0.3.1"; sha256="0mvw5zr7l29fgm6dan285gjnmmzz59a19v8b2w4j035jzbf1vffw"; depends=[tuneR]; };
   AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; };
   AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; };
-  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.3.0"; sha256="1aps8fnh2d4vw5c9ypmgqnvwqzkjjfrmm7wq4xcy6lmlqks35zdv"; depends=[mvtnorm Rcpp]; };
   AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-21"; sha256="1gn0ixxi42rw8vr4ykl232cmdcc1qqbbivhw3n8f20jgicwg8x06"; depends=[fastICA R_matlab tkrplot]; };
-  AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
+  AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.3"; sha256="0nvw5x8hjjhhhip6qv6qybbmzmim7c5k2a68zgw6hfqgvi6b3k0b"; depends=[MASS TSA tseries TTR urca]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; };
   AnimalHabitatNetwork = derive2 { name="AnimalHabitatNetwork"; version="0.1.0"; sha256="1bhqypkiw5v9w26jbdmhndqj5hjfmf7zwivrq2hgs0zcjxwa8gfn"; depends=[ggplot2 igraph]; };
@@ -173,7 +171,7 @@ in with self; {
   AntMAN = derive2 { name="AntMAN"; version="1.0"; sha256="1dm2fb59r4drbyi21bf48c9r6ajhm507q80syl3xwyqimgbgm8ss"; depends=[mcclust mvtnorm Rcpp RcppArmadillo sdols]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
   AnthropMMD = derive2 { name="AnthropMMD"; version="3.0.1"; sha256="0f2j4nwni87r11zav4lvy0c8k9v6yrk2li3vls2xa02nlci64x26"; depends=[plotrix scatterplot3d shiny smacof]; };
-  Anthropometry = derive2 { name="Anthropometry"; version="1.12"; sha256="1m9ynypl5hyyqqmknd9hgys927bsglhg3l9rydy36l7lk1kf2m9m"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
+  Anthropometry = derive2 { name="Anthropometry"; version="1.13"; sha256="1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8"; 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]; };
@@ -185,7 +183,7 @@ in with self; {
   ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.4"; sha256="1wdr72w0qfh165v5prgxx0py7344v8rw03rhnh7pi5rwd5nyxvhv"; 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.1.0"; sha256="05i49wpzpab1yffxxifjr6iqz8qc1xba7pj9rlnvcmx29f5x8b6w"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
+  Arothron = derive2 { name="Arothron"; version="1.1.1"; sha256="18vman573mss704v5rqa13vq5nwlbdrg1j5b4wc441782znm34y3"; depends=[abind alphashape3d 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.12.1-1"; sha256="0phcagfjxrakkap0kffclcqjspb2rmhq81k934mxgh1qz5a68ksv"; depends=[]; };
   AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; };
@@ -194,8 +192,8 @@ in with self; {
   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]; };
   AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
-  AsyK = derive2 { name="AsyK"; version="1.3.2"; sha256="1ijl4cchbqaa13j3mnrjlg3kpxmqpjbvf48x6p9vvmhiy1n4974w"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; };
-  AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; };
+  AsyK = derive2 { name="AsyK"; version="1.5.3"; sha256="0pa8j757kvb82n1hn2npvv3yam0s1l3mgd7130kz7pas2gkwwy5n"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; };
+  AsynchLong = derive2 { name="AsynchLong"; version="2.1"; sha256="111kg1cacqlz4df1lnijybnrifjscjm78ji9p0ia615gacvdcfxa"; depends=[]; };
   AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; };
   AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
   AurieLSHGaussian = derive2 { name="AurieLSHGaussian"; version="0.2.0"; sha256="0dzwqv396inbx4r6758vr4gip1y42ahavspadgm4xhafvipg73rb"; depends=[flexclust igraph lsa reshape2 stringdist]; };
@@ -208,14 +206,15 @@ in with self; {
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
   AzureAuth = derive2 { name="AzureAuth"; version="1.2.3"; sha256="0vi5888qvsmdwvzz46wabg2244liwfzyjd13h1d3wvbarzy7m8wf"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
   AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; };
-  AzureContainers = derive2 { name="AzureContainers"; version="1.1.2"; sha256="0k93zwl090jnkqa255rd0bhkimdnq61iavrfn40122g6hzd52xqk"; depends=[AzureGraph AzureRMR httr openssl R6]; };
+  AzureContainers = derive2 { name="AzureContainers"; version="1.2.0"; sha256="1mr1xpb1wl8khzhi6hcbfvxmn7jc1p4n7m76rc13axjgv6cb00zr"; depends=[AzureGraph AzureRMR httr openssl processx R6]; };
   AzureGraph = derive2 { name="AzureGraph"; version="1.1.0"; sha256="0b7bfzvv0115giahs12b0h4qq4fdc5qf5kc8hmvjca6jlgysgvf4"; depends=[AzureAuth httr jsonlite openssl R6]; };
-  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.2"; sha256="1kc16dfmaq825sfyc6ka8rc26qh95a70ljq9sg7xvwm05qm9y10l"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
+  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
   AzureKusto = derive2 { name="AzureKusto"; version="1.0.4"; sha256="14gp9qif8p6h7dnw5isls2kvlf77bz3lwr15by2cpa0w5rvzamaj"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
   AzureRMR = derive2 { name="AzureRMR"; version="2.3.0"; sha256="01yj145897v2017asy31rxmkzng7zv1r6avnp2c8vl707cd7afd5"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; };
-  AzureStor = derive2 { name="AzureStor"; version="3.0.0"; sha256="1lxcvgs0gb7ybnqf2ifz5bpc50nn8375g5h6i5jvx6g8ahzppi0d"; depends=[AzureRMR httr mime openssl R6 xml2]; };
+  AzureStor = derive2 { name="AzureStor"; version="3.1.0"; sha256="0wnb7mrchcd3s6zs6ry09xzsvsvgb3s95gagvsprns7y0adgb85m"; depends=[AzureRMR httr mime openssl R6 xml2]; };
   AzureVM = derive2 { name="AzureVM"; version="2.1.0"; sha256="0vb295kcz7j53xhzgsril56b4l8d69jyvkni67bqk8cxxh4qvsgx"; depends=[AzureRMR jsonlite R6]; };
   AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; };
+  AzureVision = derive2 { name="AzureVision"; version="1.0.0"; sha256="1mvnq65sh3kgxfwxvfp26vv0nwa3xldkp65ya4mm0rqxr4zm3h4w"; depends=[AzureCognitive AzureRMR httr]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
   BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
@@ -226,12 +225,11 @@ in with self; {
   BALCONY = derive2 { name="BALCONY"; version="0.2.10"; sha256="1wfy0dmwfzd9jp6g92ld8jqzx97grgq4h6dy4y5063vfd9i4slwx"; depends=[Biostrings dplyr progress readr Rpdb scales seqinr]; };
   BALD = derive2 { name="BALD"; version="1.0.0-3"; sha256="1azyqami07g3ax60j0ws3d1qha65k0svn2v5c9pisni0qch5xql0"; depends=[lattice logspline rjags]; };
   BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; };
-  BAMBI = derive2 { name="BAMBI"; version="2.1.0"; sha256="029yzjv6zj54g9g0g4c6aj89dilcasnjipsf2d95n1xkzpvssvyp"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; };
-  BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
+  BAMBI = derive2 { name="BAMBI"; version="2.2.0"; sha256="1ch74zwv01a42vpvr9irdb2a3ivs1zrgdb907p50pq2lasmqdxah"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; };
+  BAMMtools = derive2 { name="BAMMtools"; version="2.1.7"; sha256="1xpks3in0mj1b82z3ax2k3q06bgr3sj0nhr2dbs2crbvszb8hcp2"; depends=[ape gplots Rcpp]; };
   BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; };
-  BANOVA = derive2 { name="BANOVA"; version="1.1.4"; sha256="10mapmichzmm99swp0hdbrr147cj9wr6mxpv5vyq5f0zh39mz43p"; depends=[coda rjags rstan runjags]; };
-  BART = derive2 { name="BART"; version="2.6"; sha256="1zghz9jpqcfhax39his97dwylx4l4yzjch49a6ibgkx10llb3dbr"; depends=[nlme nnet Rcpp survival]; };
-  BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; };
+  BANOVA = derive2 { name="BANOVA"; version="1.1.6"; sha256="07lxnklz8a2jrrmljhngs1zdrasl7fmn8n60rp8ns394ar7w640m"; depends=[coda rjags rstan runjags]; };
+  BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
   BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
@@ -247,12 +245,14 @@ in with self; {
   BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; };
   BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; };
   BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; };
+  BCA1SG = derive2 { name="BCA1SG"; version="0.1.0"; sha256="14jvi5gn19f72szcnyhfpdld00cc7gyih5qrm4bpzvp553f1svvk"; depends=[logOfGamma Matrix]; };
   BCBCSF = derive2 { name="BCBCSF"; version="1.0-1"; sha256="0hvhnra68i0x78n57nlbxmz0qwl2flng9w47089jw6f9hzkq9r7n"; depends=[abind]; };
   BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; };
   BCDating = derive2 { name="BCDating"; version="0.9.8"; sha256="1px9fimg3fqx8bfkzq6rl34xclc9gcjxqjvj5islpdy4f1ifwph3"; depends=[]; };
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
   BCEA = derive2 { name="BCEA"; version="2.3-1.1"; sha256="0ppjcbcapmg6j5gdalw1j86w50xwaanvhld9zpzp5fvj8b7f016b"; depends=[dplyr MASS rlang]; };
   BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; };
+  BCHM = derive2 { name="BCHM"; version="0.96"; sha256="1zmv6ghg76pdd98qngvkr9814sjq4ah5h0g2z6ch5fnvwry0r2bv"; depends=[cluster clValid coda crayon knitr plyr rjags]; };
   BCRA = derive2 { name="BCRA"; version="2.1"; sha256="0n1f2qcwca7lb90qmim5dc3wj3hf5b31nh0xiw64k1cv8lhqc0mz"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
   BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
@@ -261,11 +261,11 @@ in with self; {
   BDEsize = derive2 { name="BDEsize"; version="1.2"; sha256="1b2lms4nmn6gfjmnjq1vq1g3s1ikv7pl4xpbsxfrph14g6awidax"; depends=[fpow ggplot2 shiny shinyalert]; };
   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.61"; sha256="0xq9zygxs7jli9cw4rsl9ajs6nnl5adfilb47cjdk263909fla5j"; depends=[igraph]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.62"; sha256="1b1vfar940swvn3pcil848qsp8ji50fjjll8jjzp6y2adx0f8pby"; depends=[igraph]; };
   BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; depends=[rtf]; };
   BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr 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.6.1"; sha256="0zsl9snsx3jv0j3wwa2b3f0kizj7n8s77y62vc0wa06zcqc2fjb8"; depends=[BH crochet Rcpp]; };
+  BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.1"; sha256="03jf8k1sa43ddb6m07g78r1z3rx8aznywmwllsivi674am0qk1qj"; depends=[crochet]; };
   BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; };
   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]; };
@@ -276,58 +276,57 @@ in with self; {
   BGData = derive2 { name="BGData"; version="2.1.0"; sha256="168lvmcfj9ch2dfp8haykgz8cwmrp1yqn01hbyssqfgpc42lrgf3"; 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.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; };
-  BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; };
+  BGPhazard = derive2 { name="BGPhazard"; version="2.0.0"; sha256="1qh3jylzdf66kx48gq83gc11d2qd27h4l88s965p25lw99lz528b"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr purrr readr rlang survival tibble]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-  BH = derive2 { name="BH"; version="1.69.0-1"; sha256="18mckfwxxv8m8rzaz03mg2h6vhaj7y131h6yasfg0s73nxj47zd0"; depends=[]; };
+  BH = derive2 { name="BH"; version="1.72.0-3"; sha256="1ay8vb6i730lipg8b8g3893vqglhw2kqpc29lwdrxdkb66iw33l8"; depends=[]; };
   BHAI = derive2 { name="BHAI"; version="0.99.2"; sha256="1hawa55mk590is8ziav7fdszsa3a42bqb0znzqsazz5lkg4daaa7"; depends=[MCMCpack plotrix prevtoinc]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.3"; sha256="1cha6bw0zvv30y2hjl1a4d04g1r80dfa7r7zi63q5jjnnbklbswg"; depends=[oro_nifti wavethresh]; };
-  BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.0"; sha256="1dgbwzl79ibg8fkin8h2q52jas9mzwn049jjjrsdf2p59mf2g4sn"; depends=[Rcpp RcppArmadillo]; };
+  BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.2"; sha256="1y0fjdrg0wg66r3blb8app0h52f24v8vl04n0mgk9ypm45hm64my"; depends=[Rcpp RcppArmadillo]; };
   BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; };
   BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; };
   BIEN = derive2 { name="BIEN"; version="1.2.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="2.3"; sha256="1lnw31dl161siml6vcp74c30g0rld962ry3am9ljxmd9mw83shnz"; depends=[haplo_stats httr knitr XML]; };
-  BIGL = derive2 { name="BIGL"; version="1.4.1"; sha256="1n9b5wyzh9nihhrxagdisv06g925aw5ihrszd8iplp8ffvjr5mns"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BIGL = derive2 { name="BIGL"; version="1.4.2"; sha256="0lrc7d6g7kr28sjib21x6p7nivyy2s057l0zm4ml1f0h1dppkxdl"; 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="2.1.1"; sha256="0i7z0pxxp2b11gnsb51q89zk8wnxz1d86yv08xqf7zivgdf0sgpc"; depends=[data_table jsonlite minpack_lm rappdirs raster sp]; };
-  BIOdry = derive2 { name="BIOdry"; version="0.6"; sha256="0pf8fa53hx1drcy4g8sri9mllzinqi9anvz504c3wy1b9vjljqxv"; depends=[ecodist nlme]; };
+  BIOdry = derive2 { name="BIOdry"; version="0.7"; sha256="1psy1ckla8pdl3nshgzh7w6074fqfylkb3nn74hn0q02lgsz1vd6"; depends=[ecodist nlme]; };
   BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; };
   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=[]; };
   BLOQ = derive2 { name="BLOQ"; version="0.1-0"; sha256="1ag0dy3cjdxhlspmzfdnpli030g6gwac50n5s30igcyrmw6kl4hf"; depends=[maxLik mvnmle mvtnorm]; };
-  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.0"; sha256="0q01v5xz45adn4zsdfh9s4c8g6rkbllh2y3lga6wgfn0wnhp6nzn"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; };
-  BLR = derive2 { name="BLR"; version="1.5"; sha256="1aj4qs0zjca2ifx3y4a0s6c59lbsgracili2an5nr2rxnsl10aw6"; depends=[SuppDists]; };
+  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; };
+  BLR = derive2 { name="BLR"; version="1.6"; sha256="1wivqh19kxgr7nwa09s5ay6x1yidjk4hqanv0mzb1nbik98w9024"; depends=[]; };
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
   BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; };
   BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; };
   BMA = derive2 { name="BMA"; version="3.18.11"; sha256="13b9agsra9lv00dkmx57zbf6n7xixxlihk7svxaafk8snbyyhk5z"; depends=[inline leaps robustbase rrcov survival]; };
-  BMAmevt = derive2 { name="BMAmevt"; version="1.0.3"; sha256="0p1y4yc502r4wjc1vkpa4q9d3xzxnyvp13y910vq5z5nqixjdfsp"; depends=[coda]; };
+  BMAmevt = derive2 { name="BMAmevt"; version="1.0.4"; sha256="10241cibzmgrmxzjw7fpw64qkayc1wig5xilahyc182841k4if6w"; depends=[coda]; };
   BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; };
   BMRSr = derive2 { name="BMRSr"; version="1.0.0"; sha256="0xdzzwmn2ibzgy68djsf7jxayfwd2yr1qsa0dcg9zl4rhl6b8nrl"; depends=[httr readr stringr tibble xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
   BMTME = derive2 { name="BMTME"; version="1.0.12"; sha256="0v1f1c2nk7f51c017jscyzkx7y21b3lmxp46xgs8hqcfjfw9b65m"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
-  BMhyb = derive2 { name="BMhyb"; version="2.1.5"; sha256="0yyvrn5akj132zkxlg5kicj12d7agzmi84jird4aj7hvi88l5wwv"; depends=[ape corpcor cowplot DEoptim geiger ggplot2 igraph lhs MASS Matrix metR mvtnorm numDeriv phytools plyr 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.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]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2019.9.18"; sha256="1s4mifmlvh0b0w4ckllg49z2jwfzy5d2x7lak38r92yg75nabng6"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; };
-  BNPmix = derive2 { name="BNPmix"; version="0.2.3"; sha256="1vrblwcrhmkgcgpdlb42lfysgpznaxljiaz6jn2jq7qnsiyqnrmy"; depends=[coda ggplot2 Rcpp RcppArmadillo]; };
+  BNPmix = derive2 { name="BNPmix"; version="0.2.5"; sha256="16k7161yk1blpqwy9kj8lw565v9zl1298kqmf0agx8wjjjll4jyh"; depends=[coda ggplot2 Rcpp RcppArmadillo]; };
   BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; };
-  BNSP = derive2 { name="BNSP"; version="2.1.1"; sha256="0bwh7kkga2jh5y79h4dwpxlbxmy2cq4jjy6djikwa8ghhck69c4p"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; };
+  BNSP = derive2 { name="BNSP"; version="2.1.2"; sha256="0ww09khxfi51spdh8b1qqi7hfms1djfs8pv2g3w5767aggr0b017"; depends=[coda corrplot 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.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]; };
+  BOSSreg = derive2 { name="BOSSreg"; version="0.1.0"; sha256="1nngs9j1hbb9ws423dxccjxwpkc5zl6l0zv46gb0v6m8y11d077b"; depends=[Matrix Rcpp RcppArmadillo]; };
   BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; };
   BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.0"; sha256="176z7ajyfcfljv36d2sa15cvw047rsir3gn0l4lxmcyliw93r4lv"; depends=[]; };
   BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; };
+  BRL = derive2 { name="BRL"; version="0.1.0"; sha256="13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi"; depends=[]; };
   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]; };
@@ -338,8 +337,7 @@ in with self; {
   BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
   BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; };
   BTM = derive2 { name="BTM"; version="0.2.1"; sha256="17h032dbg8n48dc74khab8vpprk76hlyngsgb52wlhczapkckf94"; depends=[Rcpp]; };
-  BTR = derive2 { name="BTR"; version="1.2.4"; sha256="0vf71a36id6zgx0phb0kyry7y9xcdhnincxh3fryzhdigxkahg4h"; depends=[diptest doParallel entropy foreach igraph infotheo poweRlaw Rcpp]; };
-  BTSPAS = derive2 { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; };
+  BTSPAS = derive2 { name="BTSPAS"; version="2020.1.1"; sha256="004klyyg9gqalwx2i5lx57p1qxrm50nszzg839kv3v421b14qg80"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2]; };
   BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; };
   BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
   BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; };
@@ -354,10 +352,10 @@ in with self; {
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
   BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; };
-  BacArena = derive2 { name="BacArena"; version="1.8"; sha256="09iknsxcp2yqwa93frzw20d8p0ayzrpwrgmbsd75jagm0iidv7a0"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; };
+  BacArena = derive2 { name="BacArena"; version="1.8.1"; sha256="0ivrgv0i81hxfd1gpnx4z6akl0rpcb5sqsvk1xp7rbln14pg1pz4"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; };
   BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; };
   BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; };
-  Ball = derive2 { name="Ball"; version="1.3.8"; sha256="0zzi4xmarha30n5c2k452vr4dli1nc1rpx79pwfaj5h0rn1q01yy"; depends=[gam mvtnorm survival]; };
+  Ball = derive2 { name="Ball"; version="1.3.9"; sha256="1cznrlgj75xwgpqqsnl0vnjd7pwvkna0cakdz4bcya4hn74dx27y"; depends=[gam mvtnorm survival]; };
   BallMapper = derive2 { name="BallMapper"; version="0.2.0"; sha256="1hf94d41cks8mbrb985mpd0nqgirvm096cfv7bsy0182bbxlk6s1"; depends=[fields igraph networkD3 scales stringr testthat]; };
   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]; };
@@ -366,8 +364,6 @@ in with self; {
   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.5.4"; sha256="0a8p9k232ab36xjr5a8rkk19zf8cx8q1pvx54z0xg1dncn28lxwa"; depends=[curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; 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]; };
-  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.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
@@ -381,13 +377,14 @@ in with self; {
   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=[]; };
   BayesESS = derive2 { name="BayesESS"; version="0.1.19"; sha256="023r5pxqa2ll3vyfmchdlcg6ay0qixphz24078g1immqp43mlrxm"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; };
-  BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
+  BayesFM = derive2 { name="BayesFM"; version="0.1.3"; sha256="0bfi1g6s02brd3phsg3sxvyc7sqvd48vlx37yavbg1nnyx1c53rw"; 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="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
   BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
+  BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; };
   BayesMallows = derive2 { name="BayesMallows"; version="0.4.1"; sha256="0q89al122393nym9i71gz5mh10d304fcnbw2naxwzmj744g3lpm2"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows 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]; };
@@ -396,10 +393,11 @@ in with self; {
   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]; };
-  BayesPostEst = derive2 { name="BayesPostEst"; version="0.1.0"; sha256="07pj4mrwnlimwrv876x1wcyi1yddd5m074lx7vp3q39qjkphcgk1"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges R2jags reshape2 rlang runjags texreg tidyr]; };
+  BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.0"; sha256="0yyf9mawpq8ynw5mx0684f8yw3ajf01wadfdvs2yanjlgqbmy1sj"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; };
   BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
   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]; };
+  BayesSUR = derive2 { name="BayesSUR"; version="1.0-4"; sha256="1n38k9y1hvymfq556d5v2q69wqycvzdkjjgwzx0sz236wdqi64wv"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; };
   BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.1"; sha256="0bvlhhivdaw386ir5zb47bxg5dbqlfjfxbs28gjdr0csskwvh107"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
   BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; };
@@ -411,18 +409,18 @@ in with self; {
   BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; };
   BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
-  BayesianFROC = derive2 { name="BayesianFROC"; version="0.2.0"; sha256="08105wivfycdq2hxs2lfwdl5jqmrfa2psdkjbw753as3fc0jpwrf"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; };
+  BayesianFROC = derive2 { name="BayesianFROC"; version="0.2.1"; sha256="017vdlw07mn0g3h8illvs0n4xdq6j6qvx1251gmhwvlnyb9lc2vh"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; };
   BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
   BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; };
   BayesianPower = derive2 { name="BayesianPower"; version="0.1.6"; sha256="1n41blyqmjq2zdhbz8srsx32piyg26fwgzfphhka12ybk93b2d2h"; depends=[]; };
-  BayesianTools = derive2 { name="BayesianTools"; version="0.1.6"; sha256="1177ghvm4psb14395wmdbbcjbbxbjqdkpck1hhrw71b0cbw5vnp5"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
+  BayesianTools = derive2 { name="BayesianTools"; version="0.1.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
   Bayesrel = derive2 { name="Bayesrel"; version="0.1.0"; sha256="0nv5rar9h0yf2f710yb7g61lp8gvrkprp4qqqpc6r6vc22g8d02p"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; };
   BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
-  Bchron = derive2 { name="Bchron"; version="4.3.0"; sha256="1pbm2s2qpha58q5girc9vssanxqv6r65bwxw5fk5dmpgvl4ag3vj"; depends=[coda ellipse MASS mclust]; };
+  Bchron = derive2 { name="Bchron"; version="4.5.0"; sha256="0nxf0wzx2y3h7q0c23avn5hs7cqh9347xlk8l8fn65yd0d9xqrch"; depends=[coda dplyr ellipse ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr viridis]; };
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
   BeSS = derive2 { name="BeSS"; version="1.0.6"; sha256="018gwcxhpmrblqh389krcpvxwrzl6fg25fg3mqrdvkalyx9xja5w"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
-  Benchmarking = derive2 { name="Benchmarking"; version="0.27"; sha256="0y31l3ddxm16sylw7p6dnv39w9ydjkjn92gi0za7s0vx07mzimxp"; depends=[lpSolveAPI ucminf]; };
+  Benchmarking = derive2 { name="Benchmarking"; version="0.28"; sha256="1f13m6fz9wd6zzknglcl0za16dbjsxn9f2714rpg8hcsr3hrlhdl"; depends=[lpSolveAPI ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
   Bergm = derive2 { name="Bergm"; version="5.0.1"; sha256="1zy2ar43v7pf1ibbhf7visy1ia24lfpa2kb921vxd7hiilky1h8v"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; };
@@ -452,6 +450,7 @@ in with self; {
   BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; };
   BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0"; sha256="0iia9sbpnqp07h591d7ifvxq74nvnv0xspka2479qy7il9p65d3r"; depends=[Rcpp]; };
   Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; };
+  BinaryDosage = derive2 { name="BinaryDosage"; version="1.0.0"; sha256="10nf11c57j0ls4znm137w831s7zmihg7bybrfg666hx7c9amspjw"; depends=[digest prodlim Rcpp]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
   BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.3"; sha256="0fydh3pp7y0glk2rhihcslzx10hgn5la922jbnqzg2nplvzv7ybj"; depends=[expm Formula lmtest numDeriv]; };
   BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; };
@@ -461,24 +460,25 @@ in with self; {
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioMedR = derive2 { name="BioMedR"; version="1.2.1"; sha256="0l3nmnqv0gzkbby4fhajbba910zpnbyckvxwds353pn54g9pcry7"; depends=[Biostrings ChemmineR fmcsR GOSemSim MASS org_Hs_eg_db pls randomForest rcdk RCurl rjson]; };
   BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; };
+  BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; };
   BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; };
   BiocManager = derive2 { name="BiocManager"; version="1.30.10"; sha256="03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk"; 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.11-3"; sha256="1ba19vlxpy88xcryf3xki3h49hbmkz9hf69lni6swl2rh1k7fx41"; depends=[Rcmdr rgl vegan vegan3d]; };
   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]; };
+  Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; };
   Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; };
   Bios2cor = derive2 { name="Bios2cor"; version="2.0"; sha256="1rrz0vs6wbkwys3l5jv1rdnlhyb4r1q9pv7jlnmsx6c1b4f4vz5n"; depends=[bigmemory bio3d circular igraph]; };
   BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; };
-  BisqueRNA = derive2 { name="BisqueRNA"; version="1.0"; sha256="1ks91gjfcnajg540930drcnqcrn4fi3735hywyy3y6i1q0wnq9vb"; depends=[Biobase lsei]; };
+  BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.1"; sha256="0jbplh1vfcr5rwqbli2h5bg7b3rdkc9vbsyj7fzlz474blzfg6mr"; depends=[Biobase lsei]; };
   BivGeo = derive2 { name="BivGeo"; version="2.0.1"; sha256="1sj52v1zmk425jw9acq9y0jdp3agx103yzf1bjbc5vrmk1x0i0qr"; depends=[]; };
-  BivRec = derive2 { name="BivRec"; version="1.0.0"; sha256="161856bsny5jq7lmf79w9iqq5kq7c12hkxam5l746rfnrw1bzjzg"; depends=[knitr MASS Rcpp rmarkdown stringr survival]; };
+  BivRec = derive2 { name="BivRec"; version="1.2.0"; sha256="1q68qs2xm3qry7wc5ilrgjpyygfbcvvqy61yg98h5px302d1ixk3"; depends=[dplyr MASS Rcpp stringr survival]; };
   BivRegBLS = derive2 { name="BivRegBLS"; version="1.1.1"; sha256="1kpl0pwm2g40pxrfbz2d95vcrm51flg6bgc83661349cmc9a2511"; depends=[ellipse]; };
   BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.1"; sha256="1ppsayixsbq0f71il93m5ih6gjwf2pavg7dhfj8gm5y8qkiz7pwc"; 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]; };
+  Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.3"; sha256="11knwynqfxdz6zl7vzr48jpygcilsxarpmwphaajh62asdlg5w6p"; depends=[compound_Cox]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-6"; sha256="0dcmnaf0k195caajy8h4qymyfj45cjwmkcgsbwv0z7x3h9sx5k6v"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
   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]; };
@@ -503,6 +503,7 @@ in with self; {
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
   BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
   BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; };
+  Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; };
   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]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-0"; sha256="13lhs6rynyj9cw13panqbn2jzkhq5fixhfd0ldr128gvw5d43hxg"; depends=[brglm gtools lme4 qvcalc]; };
@@ -519,9 +520,9 @@ 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.8"; sha256="1yswhan5gpx4lr49smsj4fkr3f9by11m6fh4dqh793z4bzrc535c"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; };
+  BuyseTest = derive2 { name="BuyseTest"; version="1.8.3"; sha256="0kwv4jcn4rqdcglj2y9xm3i1g47jz7xdkp7r9hnvxq4xh3sp4fqr"; 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]; };
+  C50 = derive2 { name="C50"; version="0.1.3"; sha256="01cbkilvp18r4f2khkj48w0znngvqckng91530kqqdqr2wc1ssac"; depends=[Cubist partykit]; };
   CA3variants = derive2 { name="CA3variants"; version="2.0"; sha256="1wnc9qfcligpsi5ycmzw0igm14h6lvf4vd82aygnas6q41vnypwz"; depends=[ggplot2 ggrepel gridExtra multichull]; };
   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]; };
@@ -529,8 +530,8 @@ in with self; {
   CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; };
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
   CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; };
-  CARBayes = derive2 { name="CARBayes"; version="5.1.2"; sha256="0kdjjayvl0rcynpmj82j0xdd6yhfwasabgrrs4nzs8kgjvlqfxax"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="3.0.1"; sha256="1k2lv7imkzqrrsmsi7va29x3p3mb890jv7n3fsay3x9cg9n12dar"; depends=[CARBayesdata coda dplyr gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; };
+  CARBayes = derive2 { name="CARBayes"; version="5.1.3"; sha256="13l83wbacwg3mcl8njm872jaz9z15daj9qn5pb6w16iijcblk5ak"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; };
+  CARBayesST = derive2 { name="CARBayesST"; version="3.0.2"; sha256="0gi5x0j1vzgkg8xhvsfqdvsn8n6dp6wzlzdsvf5sv9nydcdbac75"; 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=[]; };
@@ -544,14 +545,15 @@ in with self; {
   CAWaR = derive2 { name="CAWaR"; version="0.0.1"; sha256="1z8xmwnxwlk0nhi22nabwzggizzsp8jzwfln0h2hkk7h1p8xjlhk"; depends=[fieldRS ggplot2 lubridate raster rgdal rgeos rsMove RStoolbox sp spatialEco]; };
   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="5.0"; sha256="0y87xg2iwsmn8klavapncd7vkqvl15z9crmx3ja56ksb36czn8kk"; depends=[ggplot2 ggrepel gridExtra]; };
-  CB2 = derive2 { name="CB2"; version="1.2.1"; sha256="089cf0pcy5xyzr6pl9ljqc52cy2bh2xfxhfh7iika2wv932wwq98"; depends=[dplyr ggplot2 glue magrittr metap pheatmap Rcpp RcppArmadillo stringr tibble tidyr]; };
-  CBCgrps = derive2 { name="CBCgrps"; version="2.4"; sha256="1zqzbvgm82lngaazxm01yqvz4wck0ykva520qlf9bv7chx6jd4rf"; depends=[nortest]; };
+  CB2 = derive2 { name="CB2"; version="1.3.0"; sha256="050fpyj0zrgl03a2mdp9xrl72ad0d92kl7s9swgn2a7g8ca34c0k"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; };
+  CBCgrps = derive2 { name="CBCgrps"; version="2.6"; sha256="0kz7dqi5mbj4q6whdcizg85hw0ikdyb2vfh3xx1v40j09qv9w4vk"; depends=[nortest]; };
   CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
   CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; };
   CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
+  CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.1"; sha256="03wm2cbyvrrfh0f8jxxllqhm176xf06fnghwzakq5ivxpi5a1qsh"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; };
   CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; };
   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]; };
@@ -564,11 +566,11 @@ in with self; {
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
   CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; };
-  CEGO = derive2 { name="CEGO"; version="2.3.0"; sha256="005y03bx8acfw3wzriyq3p8d3qvsq1l7xvwgjri67bix052ffn1x"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; };
+  CEGO = derive2 { name="CEGO"; version="2.4.0"; sha256="1rmx9ppiw7k5cznanz3m4lnhriz3fs4f7wk5h3q9wg9cyzfjhh38"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; };
   CENFA = derive2 { name="CENFA"; version="1.0.0"; sha256="0ah8rh0gbwwhdfxzj9sj4i8iqbybkga09vinlh0r514ayv2qq2x8"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
-  CGE = derive2 { name="CGE"; version="0.1.9"; sha256="1vlv96pwmc1sijrcs3bil9i1wnin013gxjr3dgdj6xakq8sl01sd"; depends=[]; };
+  CGE = derive2 { name="CGE"; version="0.2.5"; sha256="1y5i55knkkkmx9wvwgawjyplr1ylkwpinks88g714a0b4ix077a1"; depends=[]; };
   CGGP = derive2 { name="CGGP"; version="1.0.1"; sha256="0vpj2bmij8wwckyzbmid6dyzpwy4jcbgpch3j143rag7pvgmc87q"; depends=[Rcpp RcppArmadillo]; };
   CGManalyzer = derive2 { name="CGManalyzer"; version="1.2"; sha256="1993hxpaplb2qxrjfnm63alks0wb3msrffycmwd9p9md5glzci9y"; depends=[]; };
   CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; };
@@ -576,7 +578,7 @@ in with self; {
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
   CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; };
-  CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.3"; sha256="02rlznp4vkdwkf23jy84dciv2mv1421ghqxllw4i2z2jxgxvb921"; depends=[]; };
+  CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.4"; sha256="01kvqyissybg28c275a2is9v45jrv20ggsz3z6qga2r9kr13a3c7"; depends=[]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
   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]; };
@@ -602,11 +604,11 @@ in with self; {
   CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; };
   CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; };
   CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; };
-  CMplot = derive2 { name="CMplot"; version="3.4.0"; sha256="1gbgwfxxg8x2bzkd0lvnf14rp3hvlqnw3p42i2jc720zgg1vrxl5"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.5.1"; sha256="15qplnwx6ma5cxm9v59hv7hca70slzbyaxvsddr9lpd0ph29ijhm"; depends=[]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVScope = derive2 { name="CNVScope"; version="2.8.2"; sha256="08kr9q30cx102wdnm2kqjakjvjp7zfgrqamy1qc87xi7z3w6jkxw"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; };
+  CNVScope = derive2 { name="CNVScope"; version="2.9.4"; sha256="1nkaghrp7wn8h0gq6i4lny2n1lxhk0a6dwyz7d1k5k1vv6xnxwf8"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; };
   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=[]; };
@@ -635,7 +637,7 @@ 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.4-3"; sha256="0jlcc1ffd2z7sz1szbi4vrp5rihmcp18bsw27x02ivi6l21nyivf"; depends=[Matrix]; };
-  CRFCSD = derive2 { name="CRFCSD"; version="3.0"; sha256="140g0f5alnd55w9irmbidjlsv3ari8y4qb1m7m28sa30rsnrnzfm"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; };
+  CRFCSD = derive2 { name="CRFCSD"; version="3.1"; sha256="0sqhdd6rijfshvz1p02lz8ql1nwl9lqfpf3nzy719s94hjhd3f3r"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; };
   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=[]; };
@@ -643,7 +645,6 @@ in with self; {
   CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; };
   CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; };
   CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; };
-  CSTools = derive2 { name="CSTools"; version="2.0.0"; sha256="0vczsnbsijvpzzz7vbkgmwr92sk3khazxfw308v7cvbvxwflg4ym"; depends=[abind ClimProjDiags data_table ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr reshape2 s2dverification verification]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
   CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; };
   CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; };
@@ -670,9 +671,8 @@ in with self; {
   Cairo = derive2 { name="Cairo"; version="1.5-10"; sha256="1mdmd5zmjkh1b0x928zizgzh42x8swbajffb88rvnjfdhk1z0dvq"; depends=[]; };
   CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; };
-  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.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; };
-  CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.1"; sha256="0rqa6xbxzqv0ks3i4pmmzczhf6g3ss6mb96g3d71y9xa6pzdxjjp"; depends=[survey]; };
+  CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.2"; sha256="1r6jpzbxhx5xgvia3m1c2gi2crzk5d3zrbncc3r1dh6wji5z0hm0"; depends=[survey]; };
   CamelUp = derive2 { name="CamelUp"; version="0.1.1"; sha256="09i6bi2vnd7iyll9s8sbyy73l6kq8xrpf07qbcahs595x5iclgrg"; depends=[data_table R6 shiny shinyalert tidyverse]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; };
@@ -684,16 +684,16 @@ in with self; {
   CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
   CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
   CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; };
-  CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; };
+  CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; };
   CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; };
   Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
   CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; };
   CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; };
-  CeRNASeek = derive2 { name="CeRNASeek"; version="2.1"; sha256="007wzq18p8dp7v4dplxsnq3i1qvd740s59nv9ygcr28d6gvsx1fy"; depends=[gtools igraph survival]; };
-  CensMFM = derive2 { name="CensMFM"; version="1.5"; sha256="1zdky0rmh27939zka7x0276g5p6wx14hc8206q2z84q3y5mjgahp"; depends=[ggplot2 gridExtra mnormt MomTrunc mvtnorm]; };
+  CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.2"; sha256="1bjx474wbxs4wxy6j4n578cggmcj0061kbbkyhfif65qbsfgrcf8"; depends=[gtools igraph survival]; };
+  CensMFM = derive2 { name="CensMFM"; version="2.0"; sha256="1p129x2b6avv7h5ifjmkds2yfw0jwm3q1cqyrpy8j9nkli0crg1y"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; };
   CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
-  CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
+  CensSpatial = derive2 { name="CensSpatial"; version="2.1"; sha256="19nlvg61gcn9mf6nsd0ji7b05vh2qzlszif5bmm8bqxzf8wmilx3"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tlrmvnmvt tmvtnorm]; };
   Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; };
   CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; };
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; };
@@ -709,11 +709,10 @@ in with self; {
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
   ChemoSpec = derive2 { name="ChemoSpec"; version="5.1.48"; sha256="0jadmz03y6zybmhm2zg8qbhrhgawxbf4c3fs021qyhvlcrs162q7"; depends=[ChemoSpecUtils plyr]; };
   ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.3.166"; sha256="0b0pis55kz4r55qxwdlic87crnhkifvcylngkaxsfv1vqqz2wwlc"; depends=[ChemoSpecUtils]; };
-  ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.3.39"; sha256="1vd7miin5f236n5w9q7iy64fncycnh8zs0n04mir8ks76lzbga7w"; depends=[plyr]; };
+  ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.3.60"; sha256="07isl2zdimyzsr1z319s6yblvqa2hjids150agh3h7jkw32m0azq"; depends=[plyr]; };
   ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; };
-  ChillModels = derive2 { name="ChillModels"; version="1.0.0"; sha256="1829ybafx53kjwr6dbgixq3ayyvzbd9cdp4qw3l3kld6936kjilm"; depends=[]; };
+  ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; };
   ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; };
-  ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
   CholWishart = derive2 { name="CholWishart"; version="1.1.0"; sha256="1p92i5ibv9805fg8s5wrpxx63k4c1ihs1x2zlaz9vbkqypkl8aqz"; depends=[]; };
   CircMLE = derive2 { name="CircMLE"; version="0.2.2"; sha256="0qavd67295ca8jrwllkgjp5b84kxf4pik226pm9y126bz3rss9a1"; depends=[circular]; };
@@ -726,7 +725,7 @@ in with self; {
   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.3.0"; sha256="0xl587a4yym2a8b1csdgrj6fmggb3084pj3p7z4hqr2pq5jdyadk"; depends=[Rcpp Rdpack]; };
-  Claddis = derive2 { name="Claddis"; version="0.3.0"; sha256="10r1v2nla43ckhbvdvldvpmcv0j966cdsasr3vgd5wfrca5jar73"; depends=[ape gdata phytools strap]; };
+  Claddis = derive2 { name="Claddis"; version="0.3.4"; sha256="161qgj4r8qah3r1m7gx2rwn9ng62y1p6gn62r1gp43pkrp2jlqj9"; depends=[ape clipr gdata phytools strap]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
   ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; };
   ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.12"; sha256="1r9fri9mlvzhd5ki5spd6xqq6767p6hha72cr3r20s1z5327wkpy"; depends=[Biobase cluster mclust oompaBase oompaData]; };
@@ -738,12 +737,13 @@ in with self; {
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
   ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; };
   ClimMobTools = derive2 { name="ClimMobTools"; version="0.2-7"; sha256="0y2dhf7j230hvsi54dl08ds170ad7aww4c8gk0f5c2v2zfxkbya8"; depends=[httr jsonlite Matrix nasapower PlackettLuce raster RSpectra tibble tidyr]; };
-  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.4"; sha256="1819kv0h7qh285nykncdqr808b9v5fviccr0fbv2im7zni497scq"; depends=[climdex_pcic multiApply PCICt plyr]; };
+  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.0"; sha256="00w7ffcv9axddjvmc0w58c9ncy8z58lf651c5pxsq7492x3vifcm"; depends=[multiApply PCICt plyr]; };
   ClinReport = derive2 { name="ClinReport"; version="0.9.1.14"; sha256="140hpg6ybz1rlql06gk851fcvlb2k53kp46dq22cbs36frggk3rj"; depends=[car dplyr emmeans flextable ggplot2 lme4 officer reshape2 xtable]; };
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; };
   CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; };
-  CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.7"; sha256="07rh577m7xp6v0adchp0mbfs0mkglpv7p27794rm958nvfsmffds"; depends=[combinat gtools quantmod]; };
+  CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.9"; sha256="0xcdknh2fibg86h2ip8jzsv4sbai1yl19ni3g1h5p0zlyigkhs1s"; depends=[combinat gtools quantmod]; };
   ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; };
+  ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; };
   ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
   ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; };
   ClustBlock = derive2 { name="ClustBlock"; version="2.1.1"; sha256="0zgrv0bayrfp7hw14zmfl3752l1kjk27lfdgalbx39rgf4pn245g"; depends=[FactoMineR]; };
@@ -751,8 +751,8 @@ in with self; {
   ClustImpute = derive2 { name="ClustImpute"; version="0.1.3"; sha256="1rfs8vbpqjskl5ap12x6qmxg4ygaaycaas8x3ylaqvlvyy9ywhki"; depends=[ClusterR copula dplyr magrittr rlang]; };
   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="2.0.0"; sha256="03fv3mzmimsmg3d4mlp1j4d1y6qhaaaaml3f6bd8v39h03kd9450"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; };
-  Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.2"; sha256="1hh5aah5vnk1ld4hhpslr7hvxhw2b5x55rzxrm6j101sw533706h"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; };
+  ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; };
+  Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.3"; sha256="10i7mnaq968my1c5hi8bdsj05m64wlmrf4n4m118is5h1q7zss8r"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; };
   ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; };
   ClusterR = derive2 { name="ClusterR"; version="1.2.1"; sha256="131k4dsh11xx95rhbr9zx20j9y493hiil6gxbgqks8dqp7n895j7"; depends=[ggplot2 gmp gtools Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
@@ -781,6 +781,7 @@ in with self; {
   CommEcol = derive2 { name="CommEcol"; version="1.7.0"; sha256="1mgszqlv2p66gwz36qw2md7wyq35m1ncy49hjg0bllfv1df7ppk3"; depends=[adespatial ape betapart 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-6"; sha256="0l1zqygklv1s3xr6pjjrji3wmyqg7258qvgwf9c2qjim8p8y8lsr"; depends=[]; };
+  CommonMean_Copula = derive2 { name="CommonMean.Copula"; version="1.0.0"; sha256="0j489hb4vlj3xkdq9vf2qjmcfb8ccff82vsmz63f25ws9pgc2lk2"; depends=[mvtnorm pracma]; };
   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]; };
@@ -788,9 +789,10 @@ in with self; {
   CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
   CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
-  CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-5"; sha256="0p1wb97riv9mb4wiyyb1m4n2z6jf8nnfa6znwjdriphdhdwhpnha"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; };
+  CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; };
   CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.4"; sha256="108x9a83pbk6xiv1fgzwi0fpbvhpiff7aiplrsq2rfv1isjb5xhq"; depends=[data_table expm Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
+  ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.8"; sha256="1l6c6fwzrmj4sl37rcxhlglwvm1ln4rb138apj1jawnyg2i5si1x"; depends=[muhaz survival survRM2 TSHRC]; };
   Compind = derive2 { name="Compind"; version="2.1"; sha256="1cjvpgankifiql67imhxx382q2lz1jq9k0nrwzq560h0xizkak6i"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; };
   Compositional = derive2 { name="Compositional"; version="3.6"; sha256="1ngyw7zxvwav65ly6rjqc1zfrgwv3s2a2kyihjf68in6qnqigqxm"; depends=[doParallel emplik foreach MASS mda mixture Rfast Rfast2 sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
@@ -803,11 +805,11 @@ in with self; {
   ConfIntVariance = derive2 { name="ConfIntVariance"; version="1.0.2"; sha256="0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4"; 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]; };
-  CongreveLamsdell2016 = derive2 { name="CongreveLamsdell2016"; version="1.0.1"; sha256="14vxkww10ljrfkz83bl0kmi77yp8gn150h35n9r4jhm6cmaiks8z"; depends=[Ternary]; };
+  CongreveLamsdell2016 = derive2 { name="CongreveLamsdell2016"; version="1.0.2"; sha256="0fs0r3k1hvnp241fa0ymq00868skcigizqr68sp3lsmvzsdyxha9"; depends=[Ternary]; };
   Conigrave = derive2 { name="Conigrave"; version="0.4.4"; sha256="02nvk5ya9gr06ai8qnjw0xq6hfbrr91b6lx9gq08dbrnmpbmyvqz"; depends=[dplyr ggplot2 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]; };
+  ConsRank = derive2 { name="ConsRank"; version="2.1.0"; sha256="0hp6zx3y8vwnpska7bnxpmkpgjlgfw6d7jpc0f7p77j0lqlj0xyc"; depends=[gtools proxy rgl rlist]; };
   ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.4"; sha256="148zpk5a091kxrn6f73k6piwfwbqdmiyd48qinn6cbfma012n13w"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; };
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="2.2.1"; sha256="0mn0lnycz5pi821q52g1njjs2pcmvv8yynr13bh237c8cashk2n3"; depends=[lmtest sandwich]; };
@@ -815,7 +817,7 @@ in with self; {
   CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; };
   CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-11"; sha256="0z1ksim2chwg5acbvav0dzsrnzch1qmbvr2k0dhjmn8lr9rdk4m5"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; };
   CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; };
-  Copula_Markov = derive2 { name="Copula.Markov"; version="2.5"; sha256="1jn9lkdkm3i2z3z7v1xqbb3w6szlhng5l16xr2iam39ffl2vn99m"; depends=[]; };
+  Copula_Markov = derive2 { name="Copula.Markov"; version="2.7"; sha256="0bgw8493kv0skjdnwyml9m2ilgz0ac4k9nps9kilphw9l9f1if02"; depends=[]; };
   Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="0.1.0"; sha256="1r9m96r0mqqjlawhlb9d8d1hf2k2bkal2fmw6g0zabdjb19c75y7"; depends=[survival]; };
   Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; };
   CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; };
@@ -825,7 +827,7 @@ in with self; {
   CorBin = derive2 { name="CorBin"; version="0.3.3"; sha256="0jf3d0mbr0vmcqmk5p4rcvc3nc4dn6cqcj8fcqyf32y9vwxd2wii"; depends=[]; };
   CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; };
   Corbi = derive2 { name="Corbi"; version="0.5-0"; sha256="05jr0y0qjv2l5ikx8cj10nl16z5yvcjbzdz5gk7lp6kpnmgq3sbw"; depends=[Matrix]; };
-  CoreGx = derive2 { name="CoreGx"; version="0.1.0"; sha256="1hw7hnd259cspy043js8rv5mb600j3kdhrcq9iva0nmy1qayxdbl"; depends=[Biobase lsa piano rlang]; };
+  CoreGx = derive2 { name="CoreGx"; version="0.1.1"; sha256="160lf1hg4a8cxgbsiny8g0yhyp1x1c2pdlys6rc9smllhsmzd9yw"; depends=[Biobase lsa piano rlang]; };
   CornerstoneR = derive2 { name="CornerstoneR"; version="1.1.1"; sha256="017j7s3m97sxahgnvk9sm7rfx81cjp1xzsmw7b1aqi7301zjrqa7"; depends=[checkmate data_table ranger vcd]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; };
@@ -837,6 +839,7 @@ in with self; {
   Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
   Countr = derive2 { name="Countr"; version="3.5.4"; sha256="10fzmqncbnr47x35xqpsmwzadv9j6r2svisrv8vfpp27mlvp9qwr"; 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]; };
+  CovCombR = derive2 { name="CovCombR"; version="1.0"; sha256="07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx"; depends=[CholWishart Matrix nlme]; };
   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.5.3"; sha256="0r3q97zl72v7i1d9nhxgsilqczihhfq6zzhl4cmz8rbk3b7c7qrc"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; };
@@ -854,11 +857,10 @@ in with self; {
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
   CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; };
   CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; };
-  Crossover = derive2 { name="Crossover"; version="0.1-18"; sha256="108lzy76jc85gy8nz97pb3d5dhsgwwx26a9rn2xpzk6iwhngvk4x"; 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]; };
   CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; };
   CsChange = derive2 { name="CsChange"; version="0.1.5"; sha256="1xsbysjcqlky8lsgk2rbaby49zgipp3wzj5navm7kcnk04sg90f6"; depends=[boot Hmisc rms survival]; };
-  Cubist = derive2 { name="Cubist"; version="0.2.2"; sha256="1m45dpnr5djsfgqlinng6z0f2wbig2vbidlg19r3zcraqwn1agnd"; depends=[lattice reshape2]; };
+  Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; depends=[lattice reshape2]; };
   CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
   CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; };
   Cyclops = derive2 { name="Cyclops"; version="2.0.2"; sha256="0pgarrk6znfsl75bq8rvrfl371cs5qjy9xb8zp607pwlprwapvfp"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; };
@@ -867,17 +869,14 @@ in with self; {
   CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; };
   D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; };
   D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; };
-  DAAG = derive2 { name="DAAG"; version="1.22.1"; sha256="1sgrskczq92wv9vv8vbn4iaa9nh7i7hibzhps88gd7qsb4l9sy3n"; depends=[lattice latticeExtra]; };
   DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; };
-  DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
   DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; };
   DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; };
   DAFOT = derive2 { name="DAFOT"; version="0.0.1"; sha256="18r5fhb6g0s1viifkkicplzab4aand2lxiwph86w80q80bzpjlpg"; depends=[ape gtools tibble tidytree]; };
-  DAIME = derive2 { name="DAIME"; version="2.0"; sha256="02hasr08c8006ypwlia6qlg24div18hka31dasaaaaxvqrf06h2b"; depends=[]; };
+  DAIME = derive2 { name="DAIME"; version="2.1.1"; sha256="0skj878ri6h1q16nsln58ssanh3nhxfq4124fhcmfc60h1jhv336"; 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.4.9"; sha256="1zviaf7530v8w996lbma0vplabrapgwldi7h70pr0439sxaqd421"; depends=[ggplot2]; };
-  DALEX2 = derive2 { name="DALEX2"; version="0.9"; sha256="1k39gswksicrb60nx7zzna3mqdm36ckg590iw511ga7frnb8fjl9"; depends=[]; };
   DALEXtra = derive2 { name="DALEXtra"; version="0.2.0"; sha256="1brjc9lybc1sfyk0n6bd44rpapgvi3p60wxw5qaajfcxrxk1286b"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; };
   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]; };
@@ -887,13 +886,13 @@ in with self; {
   DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
   DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; };
-  DBI = derive2 { name="DBI"; version="1.0.0"; sha256="1x8wy2vg2gcgd9bww04qmf0dsn3kp0rfjd8q8j1r2x9zxccg25pz"; depends=[]; };
-  DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; };
+  DBI = derive2 { name="DBI"; version="1.1.0"; sha256="1r03j9rdcxb9bhxk40dkmy10ikz4yzsxhy3f9k9ix3x577xbfvd9"; depends=[]; };
+  DBItest = derive2 { name="DBItest"; version="1.7.0"; sha256="10fvij1bz3pvqqrg0s55x7bfgxh7nrnnjaxp8cwpk3wkp3c77pi5"; depends=[blob callr DBI desc hms lubridate R6 rlang testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.7"; sha256="0q11kza0c1caph01f247h7qm4shqycq0g9i152739xzspprjf4i1"; depends=[lattice minpack_lm SDD TSA]; };
   DBfit = derive2 { name="DBfit"; version="1.0"; sha256="19jdf693ygwfchlqvh0kywid14v0b53p33rr2dvmaqmsc6pfxbbf"; depends=[Rfit]; };
   DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
+  DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; };
   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="2.0.0"; sha256="1jhcqwxcx0my71v1lbspsm78kfqzki1yczvl4r29hqim254qsn5a"; depends=[MASS matrixcalc mvtnorm Rcpp]; };
   DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; 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]; };
@@ -914,8 +913,7 @@ in with self; {
   DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
   DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
   DEEVD = derive2 { name="DEEVD"; version="0.1.0"; sha256="037h40mi4ka5w6m6bhry5mk7rcchss07vn08pzcyikcllnnn2vaf"; depends=[evd]; };
-  DELTD = derive2 { name="DELTD"; version="1.3.1"; sha256="091ln4zyvz0pbn17y5z4kpaw3dvb338k96bqd84ajazcm41q83lx"; depends=[]; };
-  DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
+  DELTD = derive2 { name="DELTD"; version="2.6.5"; sha256="069njvzrffq64f0y05mm8pn58l9xsxacy12slj1w6np5nbvsp7b2"; depends=[]; };
   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]; };
@@ -925,11 +923,12 @@ in with self; {
   DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
   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]; };
+  DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; };
   DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.0"; sha256="1c6lys605sggni40792d1xq8ll5nbdc75r92c87grx7zh74sz98m"; depends=[compoisson COMPoissonReg nloptr progress]; };
   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.6"; sha256="0mv95409lr9psh8ia9llpx8a6861iakrfnw2h96gpi2r9scpr8fj"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; };
+  DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; };
   DHS_rates = derive2 { name="DHS.rates"; version="0.7.0"; sha256="11rzwwx6vvr66nfklqh6j86k3d0cdccg6l99azwqif0cmj81rdw5"; depends=[crayon 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]; };
@@ -939,9 +938,9 @@ in with self; {
   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="3.1"; sha256="1ypkm7fsw7vhd0c2abrmrsa2cmphxqg05j5qlrx3720qsmp5yn2q"; depends=[car lpSolveAPI]; };
+  DJL = derive2 { name="DJL"; version="3.2"; sha256="0vagpvmnbpnlxa1gj3y3gp0npf8hvpn8lyjrcggdn58rbcm2z3q9"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="5.4.0"; sha256="0412723k06ynm5f8jg8byqdx2v46g060nfbv9c5js8qxn4snz5kc"; depends=[abind boot broom crayon devtools dplyr DT fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; };
+  DLMtool = derive2 { name="DLMtool"; version="5.4.1"; sha256="0sfb1kx14qq4nxskgavbvsh78v4g5k9dmmp2vv8g2kfi73izwr83"; depends=[abind boot broom crayon devtools dplyr DT 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]; };
@@ -961,7 +960,7 @@ in with self; {
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
   DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; };
   DPQ = derive2 { name="DPQ"; version="0.3-5"; sha256="0952aq9nh18mwldcxdi170i6aqz6snnsvl5g6qm8jq2m1i9jryjw"; depends=[sfsmisc]; };
-  DPWeibull = derive2 { name="DPWeibull"; version="1.4"; sha256="024d2b2kdyxv8290a96clazzlq2i14gk9lc63p39iw6lxs1fla9y"; depends=[binaryLogic Rcpp truncdist]; };
+  DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; };
   DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
   DRAFT = derive2 { name="DRAFT"; version="0.3.0"; sha256="02y644fl5dk3qwvv45vb2zkkp4x1zciickna0pj56myh7ls08hxv"; depends=[coda ggplot2 gridExtra lubridate reshape]; };
   DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; };
@@ -971,15 +970,16 @@ in with self; {
   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]; };
   DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; };
-  DSAIDE = derive2 { name="DSAIDE"; version="0.8.2"; sha256="00qpnqqdzj8bfg2i04w47hq7by7p17n6prp7w5vzis72y7s3d07l"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.8.3"; sha256="0n1ffv48202pnnsdcd3zpgpviy8613fcgx5c796whjffrc4v8m31"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
   DSAIRM = derive2 { name="DSAIRM"; version="0.8.2"; sha256="05m6hm9h8f41n3wswbp7z80kfvmn65jypj9fwlv3k8bdm4lw1mla"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
-  DSL = derive2 { name="DSL"; version="0.1-6.1"; sha256="1zgw3dpgzbb63n1rasz8s519d9x5g3ri05xsjyxm1i6zczcnymmc"; depends=[]; };
+  DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
+  DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; };
   DSsim = derive2 { name="DSsim"; version="1.1.4"; sha256="0cspyd6msh8aci3w1fv234ca2bwpi6ylkbl45d4k0v3wzzfj20hk"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
-  DT = derive2 { name="DT"; version="0.10"; sha256="0vwhn1mcwv0hkbxnppf6vip23iiib0szvp1h3prawlkvd74xziiw"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; };
+  DT = derive2 { name="DT"; version="0.11"; sha256="09k9s07aah1apc308sj1abvr27mky6fkpl9j6lxl2x55n4immvkg"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; };
   DTAT = derive2 { name="DTAT"; version="0.3-3"; sha256="184b8qkwqlygdqzad2x2qf4hdrpsr7yffmf21jrz5yf946y621wl"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; };
   DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
@@ -991,7 +991,7 @@ in with self; {
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; };
   DTRreg = derive2 { name="DTRreg"; version="1.5"; sha256="0milc5bmks6pxhl5f3zyv3w80ld733v05cvx8i531v2ynac4v6zb"; depends=[]; };
-  DTSg = derive2 { name="DTSg"; version="0.2.1"; sha256="1j7z89gqcbrxry1pxjd9qwaygrgdsfq0rmg9yiw37ygprhjj7fx0"; depends=[assertive_base assertive_numbers assertive_sets assertive_types data_table R6]; };
+  DTSg = derive2 { name="DTSg"; version="0.3.0"; sha256="1dzzb51zash0r7afvnlv3sn738g6dxgb11s3f0skzl3s83jn15lh"; depends=[checkmate data_table R6]; };
   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.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; };
@@ -999,7 +999,6 @@ in with self; {
   DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; };
   DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; };
   DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; };
-  DZEXPM = derive2 { name="DZEXPM"; version="2.0"; sha256="0izwxy1dcwd5fz7407xjlk86yvxxfg0llivbi87qz4f79hlxkbjq"; depends=[]; };
   DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; };
   DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; };
   Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; };
@@ -1010,20 +1009,20 @@ 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.8.0"; sha256="0s84fcw3iqxddl3mkcflvv09d8j1dwsi25xipp4pikskfgkr5ag4"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
+  DataExplorer = derive2 { name="DataExplorer"; version="0.8.1"; sha256="0724ngcw2b1i2cf8jbak61saqk71f06wszvx7nhba4n0z8l503cz"; 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]; };
   DataPackageR = derive2 { name="DataPackageR"; version="0.15.7"; sha256="11bra0kgmvag4mp6hpljd8m3r1306cbncmz3x71iybkahimws813"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; };
-  DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.2"; sha256="1m84hp23ksh58x7xfpl684d85rj2whd6cx515s8m8qhrg737fkp4"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
+  DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.3"; sha256="0jg77zq12fvwnzfdk83y6wi4547g9r5zlvhjmjj1bp0xp7spcbyk"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
   DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.9"; sha256="13yrjs37ap8rmx842zp529brfr12rr4d77f2pqlj5wfppngxzv31"; depends=[ggplot2 Rcpp RcppArmadillo sp]; };
   DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; };
-  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.1"; sha256="0f0kybbi47x585rxlgdhcmrn1wr9399pd26692czg4h9qwvnka52"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
+  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.2"; sha256="1q83lw8zxzq2d1gdcsbr4mqjz6gz0c3m2vi4l8x4mj9kf497dvc3"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
   DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; };
-  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.1"; sha256="06i5vinyjkmlmz8q9m7zzc86hhyand45vxv9w7lkah5yzc785n3c"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
+  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.2"; sha256="02bg4gagd09gqdnlf5bz97d8pygfl7rl02r533y671dz2qqffpa9"; 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]; };
   DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; };
-  DealGPL570 = derive2 { name="DealGPL570"; version="0.0.1"; sha256="0q7mcgbwqd22mmcnilqi30cibk2pv25ks1yks0h3m3vd3aci4vqf"; depends=[affy dplyr GEOquery stringr tibble]; };
+  DealGPL570 = derive2 { name="DealGPL570"; version="0.2.0"; sha256="1c202gzbhqaisxvpiiajcbfsjnqrvygd19304m2n89ansv81vi8r"; depends=[affy dplyr GEOquery stringr tibble]; };
   DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="1.0.0"; sha256="1d0b534s9fidgl5q8q8g5s58v6wv3md4pl5zm5r5q3jlr6z8q5n3"; depends=[Cairo data_tree DiagrammeR dplyr ggplot2 gridExtra tidyr viridisLite]; };
   DeclareDesign = derive2 { name="DeclareDesign"; version="0.20.0"; sha256="0zdpiwh74ljc57s4cgak2j8zg3zyz9f3b47dambw2zdiy0db6wk8"; depends=[estimatr fabricatr generics randomizr rlang]; };
   DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
@@ -1035,7 +1034,7 @@ in with self; {
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
   Delaporte = derive2 { name="Delaporte"; version="7.0.2"; sha256="0qm6k9c9fs94csk9i8alxczjsr5nsgl2cfzd0l7qbh7yd8sj8vd7"; depends=[]; };
   DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; };
-  Delta = derive2 { name="Delta"; version="0.2.0.2"; sha256="00yl7rildggcv5zlis6idzjkfvz6x99c29vrra1w8l11klxnjpdy"; depends=[]; };
+  Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; 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]; };
@@ -1044,10 +1043,10 @@ in with self; {
   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]; };
   DepLogo = derive2 { name="DepLogo"; version="1.0"; sha256="0h4jpflf8amip62r936lg0k428gypag296kwl58w1d0qa5jyxrkk"; depends=[]; };
-  DepthProc = derive2 { name="DepthProc"; version="2.1.1"; sha256="059hqqjxaa6k65k6snbxvq4kpcqigri86v909kgw9vxq0jmb5pl7"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
-  Deriv = derive2 { name="Deriv"; version="3.9.0"; sha256="0hlqm216bg3l79gq6m0am0xz6vd3l2hgjnjm6lym3mkmgkka4kxw"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.31"; sha256="05w1rf07bjjp34gizdg2jbkv78jjzpy85fjp4s48yw9zbif1ppss"; depends=[BH boot expm MASS mvtnorm Rcpp]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.5"; sha256="0i9qsbi78cii0bajc69m1gp4s88nrr1khyyyy4qkpv0x05vhbl0d"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
+  DepthProc = derive2 { name="DepthProc"; version="2.1.2"; sha256="1habp2jq376zwclr17n9aw611v422783r7nfzkh1bl6yv0mchnjy"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
+  Deriv = derive2 { name="Deriv"; version="4.0"; sha256="03mlfy8jzzzbh2l18gnmw0a71n9savx4cw72yhkxq93v2xj8fy3n"; depends=[]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.32"; sha256="14sywl9k59j5h84gwddphk1xfvyd55l72axii9fgiifcjvcwj0nk"; depends=[BH boot expm MASS mvtnorm Rcpp]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.6"; sha256="0hv0f5azzykwr407q0qxkwja34q5nyzr23bnbfqlxcymgkbhv380"; depends=[DescTools foreign manipulate rstudioapi writexl]; };
   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.1"; sha256="1bqq56m4vhmgijxpyllpy08xx29k0p7lhmd0iwa06jdw4lj5rdah"; depends=[dplyr jsonlite magrittr RCurl reshape]; };
   DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; };
@@ -1059,7 +1058,7 @@ in with self; {
   DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; };
   DiPs = derive2 { name="DiPs"; version="0.5.0"; sha256="1bm3zpdp20dz4bgi0jvp064nfb5van11v20605lfq4irf6nqs8j1"; depends=[liqueueR mvnfast plyr rcbalance]; };
   DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; };
-  DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.1"; sha256="04zhyci6ywysbp2lliaz5sv0qmssxx63gr3d7kkhkjcgc37qmvnc"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
+  DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.5"; sha256="0d73aiv4fra1xwq63n3139anp479ni7dh370lxc3rc15g5qayxq8"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr 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.8-1"; sha256="11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp"; depends=[]; };
@@ -1079,7 +1078,7 @@ in with self; {
   DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; };
   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="4.0"; sha256="072131dqpnqp1hfnrzzqr1f2zpzfkk1ifflzfg727f0zhjvisd4d"; depends=[bigstatsr doParallel foreach MASS RcppZiggurat Rfast Rfast2 rgl]; };
+  Directional = derive2 { name="Directional"; version="4.1"; sha256="1irg9spq859k26xn6f2pinlcrfzmwxlw56aq4vx27n6b1f2c4kqg"; depends=[bigstatsr doParallel foreach MASS Rfast Rfast2 rgl]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3.1"; sha256="1lz4b166grrs6vs98mf6a0wg4hvh0p901h697h9dkfhkxw8cqj3f"; depends=[Formula maxLik rgl]; };
   DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; };
   DisImpact = derive2 { name="DisImpact"; version="0.0.5"; sha256="1n0lyzv6abvrrcxj4zglyl9b0j4ldj0zkznh57frn1j1imb1na1l"; depends=[dplyr magrittr purrr rlang tidyselect]; };
@@ -1089,6 +1088,7 @@ in with self; {
   DiscreteQvalue = derive2 { name="DiscreteQvalue"; version="1.0"; sha256="19c2rmizrmpf5vmsfhnk5xswnngdlh1hfcj6k0qdp00kdfgj79ja"; depends=[]; };
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
   DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
+  Disequilibrium = derive2 { name="Disequilibrium"; version="1.0"; sha256="0cxwsn57rbwyq6lnr273z5z51nb83w45zg9msw4iqfsyq2z5r5a1"; depends=[Formula numDeriv optimr]; };
   DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; };
   Distance = derive2 { name="Distance"; version="0.9.8"; sha256="19n1kjx7ikphp97118n0zwnv1prlxk9hcpn30ckxc4329m0cafvv"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; };
@@ -1102,7 +1102,7 @@ in with self; {
   DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; };
   DoE_base = derive2 { name="DoE.base"; version="1.1-3"; sha256="0y195kf3fldis17z20blrqkav4xsmy9xq6ak3gw9mgb9x59y7661"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; };
   DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; };
-  DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.10"; sha256="1kknqfpvrs46iksydg0mlld3wnjqcdhm82cx2sc20k3rpmz463b1"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
+  DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; 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]; };
   Dodge = derive2 { name="Dodge"; version="0.9-2"; sha256="0767n6hyspqrv5cgx3ghhai0qffj6haga7s86pv7mq8zvjcxjlzv"; depends=[]; };
@@ -1115,7 +1115,7 @@ in with self; {
   DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; };
   DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; };
   DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; };
-  DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.0"; sha256="0hqyy79fyc13fxfrj9ghpydvys2j5pizfvsfii1dhk2a2adh7h3y"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; };
+  DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.1"; sha256="180qfialkkgi1yzl9r7pc75bhbh87n6rx6h5ic0wbdkwsrriwl9m"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; };
   DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.3.0"; sha256="0v6b8bm683c0np99bwvn3x0bp9xwf9qgli2050n05iiqibc894np"; depends=[Rcpp RcppArmadillo xts zoo]; };
   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]; };
@@ -1126,7 +1126,7 @@ in with self; {
   Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; };
   DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
   DynNom = derive2 { name="DynNom"; version="5.0.1"; sha256="1ahs93mks2z423sxk4wjgivdz4ggvwm87dha0aan4fg4jarai98s"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; };
-  DynTxRegime = derive2 { name="DynTxRegime"; version="4.2"; sha256="0i2n48jrlxma9q43fngc614z1hfyrc2hwcijpj7zl94rxzaa4zv2"; depends=[dfoptim kernlab modelObj rgenoud]; };
+  DynTxRegime = derive2 { name="DynTxRegime"; version="4.3"; sha256="1la4y560rcs163cqmvpwsb1n70n6714kprdxpnkd849caaa93zir"; depends=[dfoptim kernlab modelObj rgenoud]; };
   DynaRankR = derive2 { name="DynaRankR"; version="1.0.0"; sha256="1smxgsxl0s5ynlphssd2q59f40zxin8im91fdcvawchc4qj2lmgg"; depends=[dplyr rlang]; };
   DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
   DynamicGP = derive2 { name="DynamicGP"; version="1.1-5"; sha256="12y56anyi3amn7czwkk4qakmgqq0mf80xrhb8ccy1sxzk7k86pfz"; depends=[lhs]; };
@@ -1135,7 +1135,7 @@ in with self; {
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; };
-  EBPRS = derive2 { name="EBPRS"; version="1.2.2"; sha256="1lmcp6nvkl1gwamhaal8dab4z7knfp36i3c1y8ny80z9i69fip1h"; depends=[ROCR]; };
+  EBPRS = derive2 { name="EBPRS"; version="2.0.1"; sha256="0xrkxfn3iw1gy89inl5k1654dcyjz8ipx2c2kfzi0522zrdpy9ff"; depends=[ROCR]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
@@ -1152,11 +1152,11 @@ in with self; {
   EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; };
   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]; };
-  EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.5"; sha256="0zq587kbl5dzwh7ilp47592frmzyqfh8m4da0830yi1060whdblk"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; };
+  EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.7"; sha256="0vblfagcr9zqdzygjrbbgg2pdd9v058ryac5mzy2ry02m534iadm"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; };
   EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; };
   EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
   EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
-  EGAnet = derive2 { name="EGAnet"; version="0.8"; sha256="052zgapy9lw4pbggylgw287ncr83yblmmh2ww02pmpnsrl0j48wz"; depends=[corpcor doParallel dplyr foreach ggplot2 ggpubr glasso igraph iterators lavaan Matrix matrixcalc mvtnorm NetworkToolbox OpenMx pbapply plotly plyr qgraph semPlot]; };
+  EGAnet = derive2 { name="EGAnet"; version="0.9.0"; sha256="0cb1xjv0m1qxm2slvhs3salxhqjmq71nnqji1nf22yrawsknn2xv"; depends=[corpcor doParallel dplyr fdrtool fitdistrplus foreach ggplot2 ggpubr glasso igraph iterators lavaan MASS Matrix matrixcalc mvtnorm NetworkToolbox OpenMx pbapply plotly plyr psych psychTools qgraph semPlot tidyselect wTO]; };
   EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; };
   EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; };
   EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; };
@@ -1169,20 +1169,20 @@ in with self; {
   EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; };
   ELISAtools = derive2 { name="ELISAtools"; version="0.1.0"; sha256="1xd14kp9fcn5zfj0pw1vmzd5wfpcf58fi6mfjx65aagdnac6zfma"; depends=[minpack_lm R2HTML stringi]; };
   ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; };
-  ELMSO = derive2 { name="ELMSO"; version="1.0.0"; sha256="0bsqx2630m817hi5p0rz8cfp5gyzqxyrysba5nm189h556k4c3a4"; depends=[]; };
+  ELMSO = derive2 { name="ELMSO"; version="1.0.1"; sha256="14wnrqrbbfb37f3wp91qib28bcanflw3asv1y0v748n36x1xbv3m"; depends=[]; };
   ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; };
   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]; };
+  EMA = derive2 { name="EMA"; version="1.4.6"; sha256="0zsc6n149wkn39sa0gw838x6pg3a2g6h4sqd74672sgj4rzx0iip"; 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]; };
   EMCluster = derive2 { name="EMCluster"; version="0.2-12"; sha256="03s828pczfll5fkwa0w6n4m4wb75paj6x0cxgg9r4qmw8w4ag464"; depends=[MASS Matrix]; };
   EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; };
-  EML = derive2 { name="EML"; version="2.0.0"; sha256="1j41ga9agbm1zbnp32ns04xx2n8w9v1m51sg9y98wr85cvdwsf1b"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; };
-  EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.6"; sha256="1zfjrz50pfhrn5s6bhbvma4yvx7d4zfinbbrawv33gk3qd6kf19r"; depends=[caTools GPArotation limSolve matrixStats shiny]; };
+  EML = derive2 { name="EML"; version="2.0.1"; sha256="1d49ii08nmf16nyh16vlbvywkggwf4ljsdhv89bvfd6f07dly70h"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; };
+  EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; };
   EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; };
   EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.1"; sha256="0n23pkn7nfxd9bxhy2fggzadb034g31n4mcwcrvr366d40hqv3iq"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; };
-  EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.7"; sha256="178j76acdksajnh65l60l94zd4l8s3xmrj2am1h4i5g3jmmrj16i"; depends=[]; };
+  EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; };
   EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; };
   EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; };
   EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
@@ -1192,15 +1192,15 @@ in with self; {
   EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; };
   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.2"; sha256="0j6acr9myp4jkg7p2sfhc58w96yz176pkcjl3q1sgdnbh6s7nl3m"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
+  EMVS = derive2 { name="EMVS"; version="1.1"; sha256="0pxf2vy3ab5d5zbq089fl27x01yyhh7nyp3g1w4xnifwnm55lx9w"; depends=[Rcpp RcppArmadillo]; };
+  EMbC = derive2 { name="EMbC"; version="2.0.3"; sha256="0ns6jmshblf00n4harhls03q9c6h1wvgvjzn8jvr3kf4gm2iz2jd"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
   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]; };
   EPT = derive2 { name="EPT"; version="0.7.3"; sha256="0ymg16wd2dkn6nb0hq43niycydpy5dnadq4011a3815qrkyj7670"; depends=[]; };
   EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
-  ERP = derive2 { name="ERP"; version="2.1"; sha256="0l3vgg7szfgi7a6qh93lh2sjnkwkhw02laxdl7x87jirmmsx3157"; depends=[corpcor fdrtool irlba mnormt pacman]; };
+  ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; 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]; };
@@ -1234,26 +1234,25 @@ in with self; {
   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.3.2"; sha256="1cw0s2jpgb7jkcly5vk96jpdgdy7nlf0ri37ab17f108mi8gb8nn"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; };
+  EdSurvey = derive2 { name="EdSurvey"; version="2.4.0"; sha256="1h27q1qml1ba1b39ymg2ma48738h3027hg5qpxpgkz01xvlzqii3"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; };
   EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.4"; sha256="1gqi3mnxnhsynk63hr0ny93m60xq4a0sjc5x0p67l6xybn2fk011"; depends=[editrules igraph Rcpp]; };
-  EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-3"; sha256="05yydwi40m5hrda01l9nj8y3d85l2n04nr39k1kni4zbciinls2b"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
+  EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
   EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; };
   EffectStars2 = derive2 { name="EffectStars2"; version="0.1-3"; sha256="0yh4krqjh1jb7gjxb9z4f5bzarps0g9jfqbbva782a881dhcdl1x"; depends=[miscTools VGAM]; };
   EffectTreat = derive2 { name="EffectTreat"; version="1.0"; sha256="1dvhqp3psjllzbv82xcxz3qxni0yv83yc16598185s42zvm6582z"; 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]; };
   EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; };
   ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.2"; sha256="1ynp3fxzi095im584bgw9v8pzgs9p2v64csyhmf0m2hqyrr4myd0"; depends=[]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; };
   EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; };
-  EloRating = derive2 { name="EloRating"; version="0.46.8"; sha256="1hsqsdik1slmdjd811mkpag96iahy62l27yj2a27mnnffi188lmi"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; };
+  EloRating = derive2 { name="EloRating"; version="0.46.10"; sha256="03cnbmm18cfh0awg221j478sb5r4r1v4hcilj5chr8qr4i1xmjvz"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
   EmbedSOM = derive2 { name="EmbedSOM"; version="1.9.1"; sha256="050j943774zmay6b62rqsb9ifd55cy5p77l0fkrb7b42jgxdqwpy"; depends=[]; };
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; };
   EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; };
-  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.0"; sha256="0kbzkahka7030hsbvjjf3cafsnqdpfg5yh0r8agsm789dm24q3k9"; depends=[ggplot2 gridExtra]; };
+  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.1"; sha256="0k37lncjq14py3fvcr925gh66i31aphkniv5dn86gibxzdvbjnqc"; depends=[ggplot2 gridExtra]; };
   EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; 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]; };
@@ -1276,8 +1275,8 @@ in with self; {
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; };
   EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
-  EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.4"; sha256="033m5v9x9f8wg6ayw0byzrm60ip9c1ksfyjyfdw14vifmpjxkz7k"; depends=[coda igraph]; };
-  EpiModel = derive2 { name="EpiModel"; version="1.7.3"; sha256="037y5q25cy3zqbj236pxx30iax2bz1wag0ndffmglhbq17da2w1s"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.6"; sha256="0qhpmh28zmgqnsyfxgv06g2slix12nn2pglgpvagx2q40rs4fann"; depends=[coda igraph]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.7.5"; sha256="0w7r26pcsw785rhd17j0sp840xa4mpsfiq04vk36afv27mgfx6wy"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
   EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; };
   EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; };
   EpiStats = derive2 { name="EpiStats"; version="1.3-1"; sha256="07iz6hhfcawfcb1n9znpafgmmgjgw7pikr71hh5c7f802k1qffw7"; depends=[dplyr epiR]; };
@@ -1288,7 +1287,7 @@ in with self; {
   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]; };
+  EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.2.2"; sha256="17sx309w4jjhgmpmk27gpj3d5pbra72vxdif4als0jhyd59kk0jw"; depends=[dplyr ggplot2 igraph qgraph]; };
   EstimationTools = derive2 { name="EstimationTools"; version="1.2.1"; sha256="0m3q71ag73ph52a6nyvwh6i33d2c42dbbx7vww9h7pqkc09z1j7a"; depends=[BBmisc boot DEoptim numDeriv Rdpack]; };
   EthSEQ = derive2 { name="EthSEQ"; version="2.1.3"; sha256="168wxxb1cyrfr8s4f9gxqj64dmc4i24g5k6yys3xay9c932gf98y"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
   EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; };
@@ -1301,13 +1300,13 @@ in with self; {
   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.4.0"; sha256="0clvdjhlkjw6wyfczp5lxkn0cmmxhwfna5p454aix7nkqnvck4wa"; depends=[corrplot dplyr DT ggplot2 Hmisc kableExtra lfe lmtest multiwayvcov openssl rio scales shiny shinycssloaders stargazer tictoc tidyr]; };
+  ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.0"; sha256="1xnikvdr2a1xahqg6rrpbsf269yppxg47b8ncdr8b3hiy1a5piwr"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio scales shiny shinycssloaders stargazer tictoc tidyr zip]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; };
   Exact = derive2 { name="Exact"; version="2.0"; sha256="142yiz9bz1abgpdqkzgdsz3bp3dwbjlmyg29a62djb8630aicgyn"; depends=[]; };
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
   ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
   ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; };
-  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.12"; sha256="106r22bqvcm6mycbk5f9k4y5mcv96czx5n5p9ypn8hvl9p25gvha"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; };
+  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.15"; sha256="1ljswn8bimzhl7dxy7nb2jmwq9v7vpp4y1jynp8djrjpdx9wnaqi"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; };
   ExpDE = derive2 { name="ExpDE"; version="0.1.4"; sha256="0yjsap92dd1sb23fhw69i0ddk3lyj5f4kwp9rvz4k0vxry10hx7g"; depends=[assertthat]; };
   ExpDes = derive2 { name="ExpDes"; version="1.2.0"; sha256="0zisgb129fdg2igc3gp8jkrv9bz2r7bz2i20ap07mqlvhq88515a"; depends=[stargazer]; };
   ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.0"; sha256="0fny5hcg76bm04vpbkvlwzw78m5gj28rvich7k1hhrhlxm3xi3hf"; depends=[stargazer]; };
@@ -1315,10 +1314,11 @@ in with self; {
   ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; };
   ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; };
   ExtractTrainData = derive2 { name="ExtractTrainData"; version="5.0.3"; sha256="0a47b3zb4igx39jn609ll9s4zwbpid723xncdjxrmamdp8dvv8r6"; depends=[raster rgdal rgeos]; };
-  ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.3-1"; sha256="139q7cniwspzqz25gad0sl44fmwgflglwri4m4brxqpfi0yp9dxz"; depends=[CompRandFld copula evd fda gtools mvtnorm nloptr numDeriv quadprog rlist sn]; };
+  ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.3-3"; sha256="0svl7szscv1blgi2vh4kaqclg95sn871hk650bym2vdkjljy6x2x"; depends=[CompRandFld copula evd fda gtools mvtnorm nloptr numDeriv quadprog rlist sn]; };
   ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; };
+  FABInference = derive2 { name="FABInference"; version="0.1"; sha256="0d11vxxa0mry735n7an8n97wmxyffsj4hirxlysljs941zhkhhw4"; depends=[MASS]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
-  FADA = derive2 { name="FADA"; version="1.3.4"; sha256="15asq4l3pir28593wpi46wxpszw81r82snv6hgkiiyqkf8pfchga"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
+  FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
   FAMoS = derive2 { name="FAMoS"; version="0.2.0"; sha256="08xyj7bnkckyk0d0kxkz7nqm7ib5by0wqmx54pwk3ak4mmh9arzi"; depends=[future R_utils]; };
@@ -1354,7 +1354,7 @@ in with self; {
   FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; 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]; };
-  FKSUM = derive2 { name="FKSUM"; version="0.1.0"; sha256="1gg76wiklyazm8k80v3c6z2xjb5mch3w54vjl84jllj2c19bcfbw"; depends=[MASS rARPACK Rcpp RcppArmadillo]; };
+  FKSUM = derive2 { name="FKSUM"; version="0.1.3"; sha256="1zz4hyqlq4517jksgx3jfz9m4gfnp49q272n0m4y9yabsd5fdv3a"; depends=[MASS rARPACK Rcpp RcppArmadillo]; };
   FLAME = derive2 { name="FLAME"; version="1.0.0"; sha256="0va9mbwlnvr64hii203rmq4x3izpix0x36kpsns43yb9wdqq70hv"; depends=[dplyr gmp lattice latticeExtra reticulate rlang RPostgreSQL RSQLite]; };
   FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
@@ -1362,15 +1362,16 @@ in with self; {
   FLightR = derive2 { name="FLightR"; version="0.4.9"; sha256="0rcnkifq6mi1i5xhk6qy2gl3bry269y4isfr8phl3car0yj39lw1"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
   FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; };
   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]; };
+  FME = derive2 { name="FME"; version="1.3.6.1"; sha256="065y6r0cwvj1q5i3f88icdf4i47bz33hbhln42gyzqhlavvnj35f"; 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=[]; };
-  FMradio = derive2 { name="FMradio"; version="1.1"; sha256="02j67xpzs488v1cghpz41dvc81yshcdgmwibygg1qm8m97jyxg3q"; depends=[Biobase expm ggplot2 MASS reshape]; };
+  FMradio = derive2 { name="FMradio"; version="1.1.1"; sha256="02d5imhagkr2cwgs6r77mbd2jg8k5ga17xp3rwaryykg2k4glacs"; depends=[Biobase expm ggplot2 MASS reshape]; };
   FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; };
   FNN = derive2 { name="FNN"; version="1.1.3"; sha256="0cllqlnynm5yaj4r64mqyyfc8phkb38rwssq8k8ikgfgr4jklxny"; depends=[]; };
+  FOCI = derive2 { name="FOCI"; version="0.1.1"; sha256="1q5zchbm7h5jizk5rl8xr31bdx9h88mzf8ih8kdqmsvpk1ckk13f"; depends=[dplyr magrittr proxy RANN]; };
   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.3.1"; sha256="1mmlq960n51hgawvdl9x5215id43ad3pims1ji9khrwk7n1hs559"; depends=[cluster ExPosition mvtnorm ThreeWay]; };
+  FPDclustering = derive2 { name="FPDclustering"; version="1.4"; sha256="0cmq3qzpqx39q01qx7hwbgld9g6pvisr332fj0iy32zqw0bmmaq3"; depends=[cluster ExPosition mvtnorm rootSolve 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=[]; };
   FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; };
@@ -1386,6 +1387,7 @@ in with self; {
   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.3.1"; sha256="0b5raplyw0qmlddcmxndwkkk0krdn6h0mdvfga8d4gvy3i8an0dh"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
+  FSinR = derive2 { name="FSinR"; version="1.0.6"; sha256="1w2sw0z4qyhnz3h790kznwmka5ml4n0kdqkynnwprsyclvxsfdwn"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; };
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
@@ -1393,14 +1395,14 @@ in with self; {
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
   FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.5"; sha256="079x3n6jh69vrgqmjskccscd21g0vni6bsyga928gndz9nvh3807"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="2.0"; sha256="0qiw60ypf3bf5xsqz2b9l82i4jvprjm8lzpp12lhl8d9j5s8m0j8"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; };
+  FactoMineR = derive2 { name="FactoMineR"; version="2.1"; sha256="1b2jsv8vlaynknd7nlra6fdmr56n7678q5s28rqmagbadiqwvj4h"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; };
   FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; };
-  Factoshiny = derive2 { name="Factoshiny"; version="1.0.7"; sha256="1s4pnikv6n767z2x8s5gqqsj64yf9ivpdb5xw0qviizf9qwg8yvi"; depends=[colourpicker FactoMineR shiny]; };
+  Factoshiny = derive2 { name="Factoshiny"; version="2.1"; sha256="0h2qf89z9yb8b1a9hh0l50vnhzbz1xb7akm5390xmlpybh22jagl"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
   FamEvent = derive2 { name="FamEvent"; version="2.0"; sha256="07xb1k3yxsbwxxg6avw2gvai2qpjjd1imjggr8q6lkgcd8j3yxrb"; depends=[eha kinship2 MASS pracma survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
   FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; };
-  FarmTest = derive2 { name="FarmTest"; version="1.0.3"; sha256="1lpl49bhnch3i56z1lrvn55qr4dimc4xp8jm3w3xiccxkpr933jj"; depends=[Rcpp RcppArmadillo]; };
+  FarmTest = derive2 { name="FarmTest"; version="2.0.0"; sha256="0dr7cr3dcvsl02sll16zfyyq1kcv5qmj29psi75h73bzanx3h64n"; depends=[Rcpp RcppArmadillo]; };
   FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; };
   FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
   FastGaSP = derive2 { name="FastGaSP"; version="0.5.1"; sha256="09dymlchc4ij5iwwi2hl7shlqr8610lv7r2qh3sbrh7j5vnr5sc9"; depends=[Rcpp RcppEigen RobustGaSP]; };
@@ -1421,6 +1423,7 @@ in with self; {
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.5"; sha256="05n8lvx3cs1ckliaj7ni2rbfcrdl7d0pzf9bkwlyd1779h684cxz"; depends=[data_table devEMF ggplot2 gridExtra plyr png sqldf stringr]; };
   FiRE = derive2 { name="FiRE"; version="1.0"; sha256="0biy53i10yj261p3y55q7mdkd8g20smszd2dx36z1jkkfr61hy84"; depends=[BH Rcpp]; };
+  FiSh = derive2 { name="FiSh"; version="1.0"; sha256="07x9z2hn5dsjmg7p6y2flanp7hnzpp2r8d994mwhc2jw5i5xqx2d"; depends=[fda_usc KernSmooth]; };
   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=[]; };
@@ -1457,7 +1460,7 @@ in with self; {
   ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; };
   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.10.2"; sha256="0p7s08bfjm297diy22km245h7hwla7986qavib6gpgigary6y64k"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; };
+  ForecastFramework = derive2 { name="ForecastFramework"; version="0.10.3"; sha256="1c57jfcd156468s0bj0v523clg6pnwbw5spkqchbyz0fxzadc14p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; };
   ForestFit = derive2 { name="ForestFit"; version="0.4.6"; sha256="00gjg1v21by2w7gmgf169vs8scyj0c9l2pf980fm4win4rwndla5"; depends=[ars]; };
   ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; };
   ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; };
@@ -1472,6 +1475,7 @@ in with self; {
   FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; };
   Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; };
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
+  FrechForest = derive2 { name="FrechForest"; version="0.8.1"; sha256="062m5z3j21rkjlkn3caqc0a3y6228ikm5cgry5hs5xvqrab32250"; depends=[doParallel doRNG foreach kmlShape]; };
   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]; };
   Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; };
@@ -1479,10 +1483,10 @@ in with self; {
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
-  FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.1"; sha256="05ldz8z2aq9xgs6p7f26vk1babb3mryw4cghhr64m5q6xh7nkwy3"; depends=[dplyr ggplot2 ggrepel rlang scales]; };
+  FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.2"; sha256="04i6h1s2p5pdm7g5q2ljrd6ix0hr8n47mczh9jf7c4bhap05zxqj"; depends=[dplyr ggplot2 ggrepel rlang scales]; };
   FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
-  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.1"; sha256="056k3gr257qg5wzcgaw0ad5y5cfzdlqkfypl170f0yy0l7gfzag1"; depends=[MASS]; };
+  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; };
   FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
   FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; };
   FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-6"; sha256="1zba28kmzpcza099k1ck7aqn7ms2fh3ijcn05xdimvssjbhsag81"; depends=[]; };
@@ -1495,6 +1499,7 @@ in with self; {
   G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
   GA = derive2 { name="GA"; version="3.2"; sha256="1v3mdbzcqhlclmj9bz94qcmxwznwwp8v5pb20clacgja6nwh3867"; depends=[cli crayon foreach iterators Rcpp RcppArmadillo]; };
   GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
+  GACFF = derive2 { name="GACFF"; version="1.0"; sha256="0lhjzb6cj8838dh4423929z7bwpa6cv3dn84rccwi3382vsq9g2c"; depends=[]; };
   GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
   GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; };
   GADMTools = derive2 { name="GADMTools"; version="3.7-2"; sha256="0aabbs35wbcchab32phiaajzf5zgiis3qfv4nr5dc0mf0qjgsc6h"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr tidyverse]; };
@@ -1503,15 +1508,14 @@ in with self; {
   GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; };
   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.3.0"; sha256="0qyawq0chwj5xvzczn5vsakis9qdvwjdx3xdfjl5k233rk2hs7nk"; 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]; };
+  GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; };
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
   GB2group = derive2 { name="GB2group"; version="0.2.0"; sha256="185am9j88f3qjv0h8ag91x8qrck4qk0a4k0mcg5k56rf2lf7s7zi"; depends=[GB2 ineq minpack_lm numDeriv]; };
-  GBJ = derive2 { name="GBJ"; version="0.5.2"; sha256="1zfddk1gn1hh67x9n5zrav5gmmrfdbnf29cz72kd3g64z2f78fgw"; depends=[BH mvtnorm Rcpp SKAT]; };
+  GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="4.0.4"; sha256="05kraj4k4dxljgm8b6f66grad2chd51ify12zns62kx1h3lj1qin"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.5"; sha256="1hinn8l2kppl0nysx5baz9am0avwdqfnspx2i8wj60w1ns41v5r8"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
@@ -1519,11 +1523,12 @@ in with self; {
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  GDINA = derive2 { name="GDINA"; version="2.7.3"; sha256="0875xfbm36gqzr0116xzlbm8rlff85rybr4s4hjzfflfvjdhgvfx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
+  GDINA = derive2 { name="GDINA"; version="2.7.8"; sha256="1aj2ssd7vpszl7p22srkkkpx4a7gkc38vrv3bq7j1zr32096y4zj"; 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.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; };
   GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; };
   GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; };
+  GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; };
   GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; };
@@ -1538,15 +1543,15 @@ in with self; {
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
   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]; };
+  GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; };
   GFORCE = derive2 { name="GFORCE"; version="0.1.4"; sha256="1x7dvzgnqfvyvp6ibdsnrn5q01ivcgkzkh0mv8nfwqg5zr78v2cz"; 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.10-7"; sha256="1h2krqfwpxf29a5plpw17sydp38d97w2kskpydgvi6ahdlfc9yzg"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; };
+  GGIR = derive2 { name="GGIR"; version="1.11-0"; sha256="0r0k48qbmm5fnl6rgpwgd8jc4l8nyjp2f4vv2givdqkmylw22281"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; };
   GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
-  GGMselect = derive2 { name="GGMselect"; version="0.1-12.2"; sha256="16d4nz5x3yy9lw974gdls18fnx7g1hfghzfq3wh7739c54pvd5gs"; depends=[gtools lars mvtnorm]; };
-  GGUM = derive2 { name="GGUM"; version="0.3.3"; sha256="1ndqm4wal2xp9sdhj0aj8828ygm2g4fx23cpnlmg3vjz4m2mjc1r"; depends=[abind psych Rdpack viridis xlsx]; };
+  GGMselect = derive2 { name="GGMselect"; version="0.1-12.4"; sha256="0p9djnkclnk64bcrd66agi2gw2j3bqvqhamfm0h59b810kh50kbn"; depends=[gtools lars mvtnorm]; };
+  GGUM = derive2 { name="GGUM"; version="0.4"; sha256="1l3kwj207c1660msxs085xrjcydxxb5q9i40m8rl25r2nrsm0yip"; depends=[abind psych Rdpack viridis xlsx]; };
   GGally = derive2 { name="GGally"; version="1.4.0"; sha256="1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; };
@@ -1575,13 +1580,12 @@ in with self; {
   GMSE = derive2 { name="GMSE"; version="0.4.0.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; };
   GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; };
   GNAR = derive2 { name="GNAR"; version="1.0"; sha256="0iv82f118b54g09dc5ggr2z793dgjhxj22v05kypz5fnbdxcl5qf"; depends=[igraph wordcloud]; };
-  GNE = derive2 { name="GNE"; version="0.99-2"; sha256="16mivsa4r8d2cg5qsh5rpg2244f74zk2ln3vbys7ivjgnjpjn7z8"; depends=[alabama BB nleqslv SQUAREM]; };
+  GNE = derive2 { name="GNE"; version="0.99-3"; sha256="11pk9w4xj27dyfn05bna99xqdb89wp0ljl798d5dyk5fcnhh7217"; depends=[alabama BB nleqslv SQUAREM]; };
   GOFShiny = derive2 { name="GOFShiny"; version="0.1.0"; sha256="04m08d9w8qqbql86c18qpnwym7agry8wspfwrnbbyp52h2pn2gxb"; depends=[rhandsontable rmarkdown shiny]; };
   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-4"; sha256="1ff49549cxrylicqgmf1b4gdqqhj8lk5fw0rzyni8ip970bfbkw9"; 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]; };
@@ -1590,7 +1594,7 @@ in with self; {
   GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; };
   GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; };
   GPSCDF = derive2 { name="GPSCDF"; version="0.1.1"; sha256="1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf"; depends=[dplyr MASS nbpMatching nnet survival]; };
-  GPareto = derive2 { name="GPareto"; version="1.1.3"; sha256="1my93nyipg0ldhf95j91hznzr48c8601a802qb18776gb3c2bpcv"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
+  GPareto = derive2 { name="GPareto"; version="1.1.4"; sha256="1awacgvss2n9r6s7dydgkg05rj328si830rj97fj900qmlv5gg1p"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
   GPfit = derive2 { name="GPfit"; version="1.0-8"; sha256="05mpiyi2vxv0wqp422n1mnxa8msc4daq40cwpnpngbcwqhlgqkby"; depends=[lattice lhs]; };
   GPoM = derive2 { name="GPoM"; version="1.2"; sha256="1hhwdpish8j3j9y5q6r5pdsl1kpbwp1hjhcq24iiz4lfssib4k9f"; depends=[deSolve rgl]; };
   GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; };
@@ -1623,13 +1627,13 @@ in with self; {
   GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; };
   GUTS = derive2 { name="GUTS"; version="1.1.1"; sha256="05njlykhxs62k5cjrfwgbqyckbvf2jxjshg3avf6vhwwf58qyjq9"; depends=[Rcpp]; };
   GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; };
-  GVARX = derive2 { name="GVARX"; version="1.1"; sha256="1y0v2qvrxhpjm6qi5h5safncqdm1ad2sgydrvi46jq613x99zynh"; depends=[lmtest lubridate sandwich strucchange urca vars xts]; };
+  GVARX = derive2 { name="GVARX"; version="1.2"; sha256="1syd2266i4v4xmz22g455y63sbk9jdzz7ni0rlhdvhsmn4pb2d53"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; };
   GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; };
   GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; };
-  GWASinspector = derive2 { name="GWASinspector"; version="1.3.4"; sha256="1kx44ld47y3w2dkx88pzsk85aqamly84bm3qvzmjf4amz2kxsc6c"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; };
-  GWEX = derive2 { name="GWEX"; version="1.0.1"; sha256="1bpjygx38rkicya37x6d88k34yc0ysr3pyfp4ci5px1xsic5cpmy"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; };
+  GWASinspector = derive2 { name="GWASinspector"; version="1.4.2"; sha256="1xqrvgm2spwkyhrn215j5b2m6lc6hck9zkrmggbyyqakv04w507d"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; };
+  GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
   GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; };
@@ -1668,11 +1672,10 @@ in with self; {
   GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.4"; sha256="10g47rbqrnfa47fj2g45m79zrxx56fk2z9abzch91m134xhi8qja"; 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]; };
   GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; };
   GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; };
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
-  GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.0"; sha256="07bx17n3b5cvp4dy22nb5lq2rcac6r8ksy9khyphbv6c5fwv3813"; depends=[data_table]; };
+  GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.2"; sha256="0ac0wmd9vbridc7ngwyjgzj2n6wd784rv1dqfyxqjx82g2kxmgqh"; depends=[data_table]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
   GerminaR = derive2 { name="GerminaR"; version="1.3"; sha256="1q52rp0xvs2mmc4mr7dx1zq78xags5j7kdgj8h05m8qh8dfhzvqf"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; };
   GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; };
@@ -1682,7 +1685,7 @@ in with self; {
   GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; };
+  GetoptLong = derive2 { name="GetoptLong"; version="0.1.8"; sha256="1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc"; depends=[GlobalOptions rjson]; };
   Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; };
   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]; };
@@ -1698,7 +1701,7 @@ in with self; {
   GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.1"; sha256="0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"; 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.9.0"; sha256="0072aidb9x969g276id68vaqvjddkb72l5smx1wlqss0h70y2r16"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; };
+  Gmisc = derive2 { name="Gmisc"; version="1.9.1"; sha256="1gskaaimiq65pl5h4h8cp1cp4klniw7qz80z8zlc5nrkzph8s1md"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; };
   GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; };
@@ -1706,7 +1709,6 @@ in with self; {
   GpGp = derive2 { name="GpGp"; version="0.2.1"; sha256="0sa2xfharyy21mfcxl7hzgmaq3x8iz834mbbcfkqm5qf689i08yj"; depends=[FNN Rcpp RcppArmadillo]; };
   Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; };
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
-  GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; };
   GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; };
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
@@ -1726,8 +1728,8 @@ in with self; {
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
   GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
-  HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; };
-  HACSim = derive2 { name="HACSim"; version="1.0.4"; sha256="12byh36ly04g8664vrcz0szn3f8kk11fxmn4n9iyrl57akl80zgv"; depends=[ape pegas Rcpp RcppArmadillo]; };
+  HAC = derive2 { name="HAC"; version="1.0-6"; sha256="1cdh3s8nm17mfjj0zdxzhlmakcd0m12xfjx0b4gyx24xkahklr8i"; depends=[copula numDeriv]; };
+  HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; };
   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="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
@@ -1739,13 +1741,13 @@ in with self; {
   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]; };
   HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; };
-  HCmodelSets = derive2 { name="HCmodelSets"; version="1.0.2"; sha256="0nwr36jgmrfvr7kn71yyah80qv55dwj8zd2hpc4ixhi4kvpr372f"; depends=[ggplot2 mvtnorm survival]; };
+  HCmodelSets = derive2 { name="HCmodelSets"; version="1.1"; sha256="1krcwx6s4fh8ngx81lmdzd12i8k2yczvc4iv9k718xnaji1b8mkd"; depends=[ggplot2 mvtnorm survival]; };
   HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; };
   HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; };
   HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; };
   HDInterval = derive2 { name="HDInterval"; version="0.2.0"; sha256="1y51q0dwav3x7c0vp571v89vq1a5mivsxsyahqrv1la12zw0m7il"; depends=[]; };
   HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
-  HDMT = derive2 { name="HDMT"; version="1.0"; sha256="0a23g42a94k3ckhgw9h4g53rrklniw65lzgj20w9p9br154kranc"; depends=[cp4p fdrtool]; };
+  HDMT = derive2 { name="HDMT"; version="1.0.1"; sha256="0wqaz3h1xdzfcgn4gp1x8ini6a836fxwm7izxgjf7r5y48cnl5z7"; depends=[cp4p fdrtool]; };
   HDPenReg = derive2 { name="HDPenReg"; version="0.94.6"; sha256="08kjyr0lkc0x5hky0i11n6x4dm9az8lbs79c0lmz32qrf9rhayg9"; depends=[Matrix Rcpp rtkore]; };
   HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; };
   HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; };
@@ -1757,7 +1759,7 @@ in with self; {
   HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; };
   HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-37"; sha256="15b03jbch8l2l5mhacn02asf5mr97pp4sk9p4k50s4hzlqkz5gnm"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HH = derive2 { name="HH"; version="3.1-39"; sha256="0qhprqspks2zjxa82cicsr7nqhpaasklsc4apxkmqfyr5dva0q10"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; };
@@ -1793,7 +1795,7 @@ in with self; {
   HSPOR = derive2 { name="HSPOR"; version="1.1.9"; sha256="06lr8l71y5fcqcnmgq7cgiab1pcc98wnqzndbxcbikbh33cx7nxv"; depends=[corpcor npregfast]; };
   HSROC = derive2 { name="HSROC"; version="2.1.9"; sha256="0x5q115c1js5l4rvdy8fg52kcgl18aj1snlj0gi1fdvjsxvglxjl"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
-  HTLR = derive2 { name="HTLR"; version="0.4-1"; sha256="0v6mbs57s5m7ab6zbaafp01lk4q7k1aldgrwq0rmqrzsq2rsar51"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; };
+  HTLR = derive2 { name="HTLR"; version="0.4-2"; sha256="1q8zlb4iya0sq2jqp4m77v66hdrfc7ncc0k8qllf16h06k24s88x"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; };
   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]; };
   HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
@@ -1802,23 +1804,22 @@ in with self; {
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
   HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
   HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
-  HWxtest = derive2 { name="HWxtest"; version="1.1.9"; sha256="1ri5dxq4qm12y1pi6pjydiz23220hffj6qa5235154m9sjz0jwx3"; depends=[]; };
   HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; };
   HaDeX = derive2 { name="HaDeX"; version="1.0"; sha256="14f4ql685wrhsmg9yklbfky7b3vsxm4dyiqmpmrl7199kqzinjc0"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; };
   HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
-  HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
+  HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; };
   Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; };
-  Haplin = derive2 { name="Haplin"; version="7.1.0"; sha256="0xj2816v4vilvb4cizsw1qb2zfi63bgfhqqakcjvkcp4b8hn5cw2"; depends=[ff ffbase MASS mgcv snow SuppDists]; };
+  Haplin = derive2 { name="Haplin"; version="7.2.2"; sha256="15q0p563qbf0v91hnx3bdcxwc7chcqzc507wmr5zrsdl8y2pqn40"; depends=[ff ffbase MASS mgcv rlang]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.3"; sha256="1irz44q6nf95h37av868f47aakwv3jgwgw217xfsfw0afkm7s25f"; depends=[mice Rcpp Rsolnp]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
   HellCor = derive2 { name="HellCor"; version="1.2"; sha256="1k7k8gj70wc31w27gykiy0fv2bs9q73414ma0hn3ziqg4cnrgl7m"; depends=[energy]; };
-  HelpersMG = derive2 { name="HelpersMG"; version="3.8"; sha256="1vlhdry53ync1fha347ffn1jvk89nxnhc2k0r3aykglbaypfwbcr"; depends=[coda lme4]; };
+  HelpersMG = derive2 { name="HelpersMG"; version="3.9"; sha256="01az2cwz2vw1z3qjmwi8va4qp37fxy955sjdlk2jbk0cysf3p20q"; depends=[coda lme4]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
   HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; };
   HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
-  HiClimR = derive2 { name="HiClimR"; version="2.1.4"; sha256="1ynxy5c2md3bpii3693zcxabldaj0s54xby19j0f616hk4kjm3gm"; depends=[ncdf4]; };
+  HiClimR = derive2 { name="HiClimR"; version="2.1.5"; sha256="0qw0gpgp00gvm0kcsghwcnnhslyrigiknw4al6gs91ppq2fd2k78"; depends=[ncdf4]; };
   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=[]; };
@@ -1828,11 +1829,11 @@ in with self; {
   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.3"; sha256="1kvq9q4lnbl2jkj7dvm2znp2ihvv1j6778pnfkkxflxa8aks29k6"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; };
-  HistData = derive2 { name="HistData"; version="0.8-4"; sha256="0qw8jrh7g9w49k6f8hsg9wvy8ms2pcsmiv2ysxfcr89v60q084rb"; depends=[]; };
+  HistData = derive2 { name="HistData"; version="0.8-6"; sha256="0an8cki2ahaf3ynbcqgikxi90l3bv7gcn6nnwnli9g1br89y3bd4"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
   HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; };
   Hmisc = derive2 { name="Hmisc"; version="4.3-0"; sha256="0rb1m6138lqzb46nss9ggvhghipd10vdnwsy6iq2wzynrynzkwkz"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
-  Hmsc = derive2 { name="Hmsc"; version="3.0-2"; sha256="19d1j425h2ylzfpb1a9yam2n82xd5gcyi843sn2x50z1gwv9kl64"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist phytools pROC statmod truncnorm]; };
+  Hmsc = derive2 { name="Hmsc"; version="3.0-4"; sha256="1h2szg5qrqfx8h982n860bw0mcwqgj1x269vd7c191yhsfhqgkny"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC statmod truncnorm]; };
   HoRM = derive2 { name="HoRM"; version="0.1.2"; sha256="0vfsya6423i25szdj5s8pa8pwshiqykikxdbbj7r2nz73x3qp6hy"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; };
   Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; };
   Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; };
@@ -1843,6 +1844,7 @@ in with self; {
   HybridFS = derive2 { name="HybridFS"; version="0.1.3"; sha256="0sb3i8ymgydi9hvxzdzydqap1gd7w5qcrs9clc0y5n26zd2mwqm5"; depends=[caTools FSelector InformationValue ROCR woeBinning]; };
   HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
   HydeNet = derive2 { name="HydeNet"; version="0.10.9"; sha256="1glzbr91cwp99qk1cyf8824fg8jvghgf84gc64jjn2q70vczcf5f"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; };
+  HydroCode = derive2 { name="HydroCode"; version="1.0.0"; sha256="060g2kspa7970m6hlv9lnvrkik8v8xgsg35hvj2radnrawrv5a30"; depends=[]; };
   HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
   HypergeoMat = derive2 { name="HypergeoMat"; version="3.0.0"; sha256="03xnvb7d80nak7wawfi2sniq9syjbjx5gk71xsgchgwqsdnixp8y"; depends=[gsl Rcpp RcppArmadillo]; };
@@ -1851,7 +1853,7 @@ in with self; {
   IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
   IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; };
   IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; };
-  IATscores = derive2 { name="IATscores"; version="0.2.3"; sha256="03pakvryg64y7w9q7v97yykqwv7w93hl6h1ry652fjgrk5z3c43k"; depends=[dplyr qgraph reshape2 stringr]; };
+  IATscores = derive2 { name="IATscores"; version="0.2.4"; sha256="1svg6d86m17ijq4mqffycq6vi3hx09kfnijjka1jq4wavrrd2jzy"; depends=[dplyr qgraph reshape2 stringr]; };
   IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
   IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.6-0"; sha256="1nlfsfdw8lfr3n2717i6kn1hafwr6hmqzfpg249amlrfjn0pghji"; depends=[dplyr lsa tidyr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
@@ -1860,7 +1862,7 @@ in with self; {
   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=[]; };
-  ICAMS = derive2 { name="ICAMS"; version="2.0.8"; sha256="1mi2kxgcakw2899b52rwlmqasiyqy858rffz81xyfmw5qdlka22c"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; };
+  ICAMS = derive2 { name="ICAMS"; version="2.0.10"; sha256="1f22bwbxnqqccmkmsx4ll8qaviz9w7f64jx1whikvnhsxw634xp5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; };
   ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad 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=[]; };
@@ -1874,6 +1876,7 @@ in with self; {
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
   ICODS = derive2 { name="ICODS"; version="1.0"; sha256="13wi4mqdwdrjfjh42sjifc6vlkj6jlm4z0x6680xdzkwq8byipi9"; depends=[MASS]; };
+  ICON = derive2 { name="ICON"; version="0.1.0"; sha256="0l0zwsb6r70b93qd1x0r7zp36w3yj4gjl3z5v3jm1w3dbk9jgq95"; depends=[]; };
   ICRanks = derive2 { name="ICRanks"; version="3.1"; sha256="1vwzqkjg7i5hm96s8frp72n6xqadlsawzr1wby1fhsxl2m5f1797"; depends=[gmp multcomp Rcpp]; };
   ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; };
   ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; };
@@ -1888,7 +1891,7 @@ in with self; {
   IDE = derive2 { name="IDE"; version="0.3.0"; sha256="1m1y7gd8i14kl54qxhjy7bnf2md5vs7bb73k7k92nizv941qn0mn"; 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.19"; sha256="13qcvfm703frs367paddz1wq9k3p17f9p5347m56bhky5hjkaphd"; depends=[lattice]; };
+  IDPmisc = derive2 { name="IDPmisc"; version="1.1.20"; sha256="0zy6mxqa8arq0vvhsdcifzm3085c23rnwa1n36fhircph1xwvfdw"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.10"; sha256="1980nsbcibsas99xcqfc54k6zhh9lg2xdgmihp846xhqgw9xjjy7"; depends=[doParallel foreach igraph spatstat]; };
   IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; };
   IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; };
@@ -1902,7 +1905,7 @@ in with self; {
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
   IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
-  IMIFA = derive2 { name="IMIFA"; version="2.1.0"; sha256="11qcazhvym4k2g983ml2h12x4iqsa6bfzgxdazrcv4af9hps0ahz"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; };
+  IMIFA = derive2 { name="IMIFA"; version="2.1.1"; sha256="1kw7lbi26fsyflrjfpn26xdf50yqsfcwnz7vh657j5jsfrgdhw2h"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
   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=[]; };
@@ -1912,20 +1915,19 @@ in with self; {
   IMak = derive2 { name="IMak"; version="1.2.2"; sha256="1g2h0c3n81hkj6zl2wc9xnjjwpv56ghp6gzcv2znc1nhs8fswxsb"; 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.2.1"; sha256="02zqrb9hnfvwxni2477fjdx3ii0a0wbm1layskmwlzsvvkc60ngn"; depends=[cowplot dplyr ggplot2 htmlwidgets jsonlite lazyeval magrittr mgcv nlme purrr RColorBrewer rhandsontable rlang shiny stringr tibble tidyr vegan]; };
+  INDperform = derive2 { name="INDperform"; version="0.2.2"; sha256="1kcs34mp6wafkkqv4pz1n8qpm633pk2das4ifkm3383gy33kjb3n"; depends=[cowplot dplyr ggplot2 htmlwidgets jsonlite magrittr mgcv nlme purrr RColorBrewer rhandsontable rlang shiny stringr tibble tidyr vegan]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; };
   INLAMSM = derive2 { name="INLAMSM"; version="0.1"; sha256="0km7kwwif2hqqa9jhglvkinzcm6gfp7mn219hqm5ds5rfgrcyl75"; depends=[Matrix MCMCpack]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
-  IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.1"; sha256="0imjmhvasfshb3z4cpcjrvmwdc668i73bagl7iww7vhfn3y7mk4n"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 magrittr markdown plotly RColorBrewer Rcpp reshape2 shiny shinydashboard shinyjs withr]; };
+  IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.3"; sha256="0l5baz68714vqlzfp6v1r93lwmv0nsq2wqidgf5zwj5r391y7c5g"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 scales shiny shinydashboard shinyjs withr]; };
   IPCAPS = derive2 { name="IPCAPS"; version="1.1.5"; sha256="0d1nws86k1yph2f4drwrh4jvmmc9nnqmmswpwirmgsp3ma58kc42"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; };
-  IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.0"; sha256="0rx1xwbdmv23r62xjf8ksbwmr7axxp7a9brd6c7g8qv3ayjjy706"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; };
+  IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.1"; sha256="0y9ph0d00dy4y2alnwyli4i0nm9rqasxy5n3d3m0a5j2vvwjjfzq"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; };
   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]; };
   IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; };
   IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; };
   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.3.0"; sha256="09nzzalz107l6dscl4xxd8znwd9fppjlfyvn1vfd9jhx7mkjlnlq"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
@@ -1933,18 +1935,18 @@ in with self; {
   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]; };
   IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; };
-  IRkernel = derive2 { name="IRkernel"; version="1.0.2"; sha256="040qig675zaxsf81ranmvk293amrswi5098k69wyq0vgqyin6vwp"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; };
+  IRkernel = derive2 { name="IRkernel"; version="1.1"; sha256="1viqxs91dys1z4cf7gb59rmqvzb8lc7jdp4azrpmhgwa8qf46s94"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; };
   ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; };
   ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
   ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.0"; sha256="0jqg03rxr3k01y29b7gq89jk2jd2qrshmq3338j8w6531r7y12lg"; depends=[]; };
   ISEtools = derive2 { name="ISEtools"; version="3.1.1"; sha256="1dipff8msky1rxbrckyxh7c5mh40q4a5hjdghsqkxklwh9zmrs44"; depends=[coda Xmisc]; };
   ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; };
   ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; };
-  ISOcodes = derive2 { name="ISOcodes"; version="2019.04.22"; sha256="0vkb2ifi0z1da4v055vavp83bm07q63ap6h27bp930zd7c6491i3"; depends=[]; };
+  ISOcodes = derive2 { name="ISOcodes"; version="2019.12.22"; sha256="1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874"; depends=[]; };
   ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; };
   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=[]; };
+  ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; };
   ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; };
   ITNr = derive2 { name="ITNr"; version="0.3.0"; sha256="1aiqkpxnam13r4q8q03yzd6a1wvl2gf40kqncbrpfvcaiv5zsq68"; depends=[blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI xergm_common]; };
   ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; };
@@ -1957,14 +1959,14 @@ in with self; {
   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.2"; sha256="1khxjh4lpsgv5qqk30ry6r8y3vjblwxsx9frv63pws4x1j6j2apm"; depends=[pROC Rcpp]; };
-  ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.2.0"; sha256="0vy32jypakpf65zqblpyxfym81kqvqikycyhgar0ms26l4fczaqz"; depends=[AdaptGauss caTools matrixStats parallelDist RcppAlgos]; };
+  ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.3.0"; sha256="1r4cm8q72il5n1glgn3c4jyb0mb0mgyc44fy047ijcxwlrrwcswk"; depends=[AdaptGauss matrixStats parallelDist pracma RcppAlgos]; };
   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-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; };
   InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.5"; sha256="1irbfdrab9mz50py8h3gnjj14swh7b1pbrqf2fj04ym206rsca02"; depends=[coda ggplot2 InterVA5 rJava]; };
-  IncDTW = derive2 { name="IncDTW"; version="1.1.2"; sha256="1w213d4z3fflkhcr1snsgy3l9vam0bslzc8h59gfphpjyf9h3hz8"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; };
+  IncDTW = derive2 { name="IncDTW"; version="1.1.3"; sha256="1lbg1frx5hlv9pj56xsr4rdzhkq2h21r74hsjhlj0gvg1ykn6hvj"; 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.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; };
@@ -1980,10 +1982,9 @@ in with self; {
   InfoTrad = derive2 { name="InfoTrad"; version="1.2"; sha256="0blfn59w73hjga15sw8plwvn6yq9fj95nxwp018mp1harl8wa5db"; depends=[nloptr]; };
   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.4.1"; sha256="0nxp416mbzawrdk4qwhg5j7lm8zdyplrngka2hw2rlsqmlwhvqzl"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; };
   InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.2"; sha256="0g52cksa774in18ykrym61l3my9zm343bgsq5mg7mki9x65xd35z"; depends=[dplyr rlang tidyr]; };
-  InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; };
+  InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.1"; sha256="0zrfyzz3l9jff7044dhrjv8rp8f258fz993ycyxyd29nd7x9n9nj"; depends=[MASS]; };
   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]; };
@@ -2026,8 +2027,7 @@ in with self; {
   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-83"; sha256="0x5839sqmy1za6ybmd54vhc1sg505k5y4qwk7hr1lv8sr85yxllh"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
-  JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.6"; sha256="0jip7kcpl3g5sywk93pmbdxidbq5gmnasrw1rlwvks74l34wrg15"; depends=[MASS Rcpp statmod]; };
+  JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
   JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; };
@@ -2036,7 +2036,7 @@ in with self; {
   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]; };
   JSmediation = derive2 { name="JSmediation"; version="0.1.0"; sha256="1qmjkachpvql0nrn7lf2n32w9zp12saha2y3zmdg086k1q12xifl"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; };
-  JWileymisc = derive2 { name="JWileymisc"; version="1.0.0"; sha256="1hk10mcbp0abm9zy7233by0220knw0axs6xiw4axr4jcabwrzlim"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS Matrix mgcv mice multcompView nlme psych quantreg rms robustbase VGAM zoo]; };
+  JWileymisc = derive2 { name="JWileymisc"; version="1.0.1"; sha256="1rd1k46h0gvkhhhcrr2d95k62msl5zxxyk03vj6asdd5r6h8hdqa"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; };
   JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; };
   JamendoR = derive2 { name="JamendoR"; version="0.1.0"; sha256="1v5i4ggc4igp83pik32fqp07ff8iv7dp93b3qhxcsy1msa4l88lx"; depends=[dplyr httr jsonlite]; };
   JavaGD = derive2 { name="JavaGD"; version="0.6-1.1"; sha256="11knns2b1b8kd4nf8zwfzdhj4xqwkx3f1ba672vqi7jfr47938hh"; depends=[]; };
@@ -2051,7 +2051,6 @@ in with self; {
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; };
   JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; };
-  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]; };
   KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0.1"; sha256="1wcm0h9lwpiw4crf15h5pfv9fxzpmf3g4jkylgnn9a36305rpdl8"; depends=[locfit matlab R_matlab]; };
   KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; };
@@ -2093,7 +2092,7 @@ in with self; {
   Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
   KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; };
   KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; };
-  KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
+  KoNLP = derive2 { name="KoNLP"; version="0.80.2"; sha256="1i2f684gsgdmmiricrlc8zgzhxk1r0smyzn08jbhfaxkf7adyczy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; };
   Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; };
   KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
@@ -2104,8 +2103,9 @@ in with self; {
   LAM = derive2 { name="LAM"; version="0.4-17"; sha256="1isvhmrrpaamahwkxxsgyq6gbzcvfsk2s4ccjavnab4p79j0x782"; depends=[CDM Rcpp RcppArmadillo sirt]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
+  LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; };
   LBLGXE = derive2 { name="LBLGXE"; version="1.4"; sha256="0a5rhijkp9xmwxlc0sx2fj6nikdwgjh2rw9pqavq8bnvvxq6ykwa"; depends=[dummies hapassoc]; };
-  LBSPR = derive2 { name="LBSPR"; version="0.1.4"; sha256="0kjf7pydvzvlvxp4lm5m1kmhgkc4ykj7n4iml22calkhgynm5din"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
+  LBSPR = derive2 { name="LBSPR"; version="0.1.5"; sha256="0bkq7lj45c5inm4klwxkwv1y39rkhwis53d1qsr908k5xmkbgg0i"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; };
   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]; };
@@ -2134,12 +2134,12 @@ in with self; {
   LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; };
   LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; };
   LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; };
-  LINselect = derive2 { name="LINselect"; version="1.1.1"; sha256="19a3qi8fcb4w12mlzrax2rjcnf6zsr9b79r2zxh10hmww30z4sr8"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; };
+  LINselect = derive2 { name="LINselect"; version="1.1.3"; sha256="1qxqwph5ja2kf1s4ggsv8w6hjgf9mr53a0gahhjix2v78309z42g"; 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.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; };
   LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
-  LMest = derive2 { name="LMest"; version="2.5.1"; sha256="09xvl1sx891q9mhyl7sx0zwxzlsl3p22pxlh8y8pbvr2wnb7frr7"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; };
+  LMest = derive2 { name="LMest"; version="2.6.0"; sha256="1vzwcnp14bfbf7173fnxy1fwl8j9n2hrvmzw9ks6778ykg21q1f6"; depends=[Formula MASS mix 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.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; };
@@ -2157,13 +2157,13 @@ in with self; {
   LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
   LPWC = derive2 { name="LPWC"; version="0.99.5"; sha256="13iv2v8lkyz9rpjzz2pr6b5g6nh79j8vd5hpx03vjyx08ii0dnq6"; depends=[]; };
   LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; };
-  LPower = derive2 { name="LPower"; version="0.1.0"; sha256="0g9y5s4k3l4zw97qh6c9jj6ysl39y4fprvqw1ybykirvgflisi8x"; depends=[MASS nlme]; };
-  LRQMM = derive2 { name="LRQMM"; version="1.1.11"; sha256="109zn1a1a9jyi88h4yqfn6yvw93xn6vdsx99bmxmz2vv8rz0j7k1"; depends=[GeneticsPed MASS MasterBayes Matrix MCMCglmm quantreg SparseM]; };
+  LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; };
+  LRQMM = derive2 { name="LRQMM"; version="1.2.0"; sha256="0v8jxpg1rpr9fm9069zh8846z5l0ad71i229pvsilvdrn1m4vf3l"; depends=[corpcor GeneticsPed kinship2 Matrix MCMCglmm quantreg SparseM sparsesvd]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
   LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; };
   LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-1"; sha256="0y9di5n8ls4xzw0yrh0kx8c73s4wf1kzdyy8ssk6garvjln9dn9v"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
-  LSAfun = derive2 { name="LSAfun"; version="0.6"; sha256="137z5hbzc22937h5g488zw3jym95dccy3rq7n84k296pihiwavax"; depends=[lsa rgl]; };
+  LSAfun = derive2 { name="LSAfun"; version="0.6.1"; sha256="1q43ds1779w4m4al8brqj4h4y7ys5q5ysw7jbdrxdrw4lwdh7qlf"; 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=[]; };
@@ -2181,7 +2181,7 @@ in with self; {
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; };
   LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; };
   LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; };
-  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.2"; sha256="16v9vwy7g7vj38pbikrinvhx2b5xdl0vd9i6yr9hhdrgqls0c243"; depends=[data_table maptools rgdal rgeos sp spdep]; };
+  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.3"; sha256="0pi1f25mgqp9sxbxsjv8335bi70cinnvapzwp8m2mfizcpbqw9hq"; depends=[data_table maptools rgdal rgeos sp spdep]; };
   LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; };
   LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; };
   Lahman = derive2 { name="Lahman"; version="7.0-1"; sha256="02f4402nsx3fr31j34lwc0jrygqwznzynn2c11nilgw5bcb29gh9"; depends=[dplyr]; };
@@ -2192,6 +2192,7 @@ in with self; {
   LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; };
   LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.1"; sha256="0xxx8967v015fy56m0hqfnr1mwgisj8ximdl05bs28ymzvdx37kp"; depends=[]; };
   LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; };
+  LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[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=[]; };
@@ -2199,14 +2200,14 @@ in with self; {
   Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; };
   LeArEst = derive2 { name="LeArEst"; version="1.0.0"; sha256="0kga9n0ia2zljyw4xa9n572zmxpwql8xd3ys4p9jp02h432pfkpp"; depends=[conicfit doParallel foreach jpeg opencpu]; };
   LeLogicielR = derive2 { name="LeLogicielR"; version="1.2.1"; sha256="0jd280ial4wfj5j6sbxgl2cbxabycsgmh2zsad7v7hcwbhhdd09i"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
-  LeMaRns = derive2 { name="LeMaRns"; version="0.1.1"; sha256="0ih6653nncijsy9wk0sqvk7im9msxz9qcc3abj539kgs1lhdgvg7"; depends=[abind Rcpp RcppArmadillo]; };
+  LeMaRns = derive2 { name="LeMaRns"; version="0.1.2"; sha256="0k7mpl2dgy2qvs068mzgfagvlk116p80cxj4dfzjkrr8wzrmwyni"; depends=[abind Rcpp RcppArmadillo]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.8"; sha256="0a464bcanq6jfm5j6692h61pipy28vm7m89y5i0hrhz7lzpy9x5z"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; };
   LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; };
   LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; };
   LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; };
-  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.2.3"; sha256="02dm2lh402gazgqs7f5gdjalrpvdxri3bryidpga2s36i9bn6y9a"; depends=[data_table pbapply quanteda stringdist stringi tibble]; };
-  LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
+  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.0"; sha256="19fcyvq2gs6iyks5x2s0xvbxqzvh9h7hpympvyrsx4026zv8x5cz"; depends=[data_table pbapply quanteda stringdist stringi tibble]; };
+  LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
   Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; };
@@ -2215,7 +2216,7 @@ in with self; {
   LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
   LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; };
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
-  LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
+  LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-2"; sha256="0axczfd71i62bi82spraf3s780yq47p3gb0kpicgdnnmbrj683rl"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; };
   LindleyPowerSeries = derive2 { name="LindleyPowerSeries"; version="0.1.0"; sha256="1nylsmxx1s6g5dzz69kaqccx3c7hzb49jan22b94816pnzd0k7zp"; depends=[lamW]; };
   LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; };
@@ -2235,7 +2236,7 @@ in with self; {
   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-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; };
-  LogicReg = derive2 { name="LogicReg"; version="1.6.1"; sha256="1aq9zr2n62p4diycfm910m6ffmd23qn8gjs0zva1brd3gbbi6zx0"; depends=[survival]; };
+  LogicReg = derive2 { name="LogicReg"; version="1.6.2"; sha256="004dd3vrb0xbwfkij4ickhvsmhfmhd3r4qr6j9haihffnbm6xbjh"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
   LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
   LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
@@ -2243,16 +2244,17 @@ in with self; {
   LongCART = derive2 { name="LongCART"; version="1.0"; sha256="03fh4glvk48lhmx2lp3vcy9k6jnfnzn73dpljq73fl8zlbr8vv61"; depends=[Formula nlme rpart]; };
   LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; };
   LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; };
+  LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; };
   LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; };
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; };
   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]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.9.5"; sha256="1ly9xlm3v552264sf44xsymv3r1v5znl3rsv5zak5zgdva0hjdjk"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M2SMF = derive2 { name="M2SMF"; version="2.0"; sha256="160qjrb3mxybvr4z6zra6rzf6scyrb9mplw36gqlfxj418ndnmm1"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="2.3.0"; sha256="1c24z5f9j4x7yf64877wgmc68lqilanhcv1h48j6jg22gr5cxamj"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
+  MAINT_Data = derive2 { name="MAINT.Data"; version="2.3.1"; sha256="08gx30r6cldnpr459kbv0y6sa4s7a2jgsjp2givcq7yx7p8a95y0"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.19.3"; sha256="0b7kdz3x4sdq413h1q09l1qhcvdnnwv6fqsqwllks1cd3xy34c57"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
   MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1-2"; sha256="1jl26ndi0zvyq29qjkmdxg9psgwyv8wapd7f0cv4w88d9gk257az"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
@@ -2265,8 +2267,8 @@ in with self; {
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MARSS = derive2 { name="MARSS"; version="3.10.10"; sha256="03kkg6slq3z12saw0vf6z9wqadzpy4yjh9bm47zl4av4pj03y6lr"; depends=[KFAS mvtnorm nlme]; };
   MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-51.4"; sha256="0x1ckf51y851g0kvbhsgdxb26vfpmbw3xdbcnh3ck7fjm13da4cr"; depends=[]; };
-  MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; };
+  MASS = derive2 { name="MASS"; version="7.3-51.5"; sha256="1k0m7pa4gb5apzrrkb5kx5d7bmkm2pl5g15vwb6j067hrqahck26"; depends=[]; };
+  MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.4"; sha256="1lpmpxgqnczlizx5gwgw96kxqkjqvbjqwf373zkvfmax2pfqr6dn"; depends=[]; };
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.4"; sha256="0x155izylzwajlnlbdnawb3b8gwxd1cx03xb1sqi3w2g50bcljbf"; depends=[]; };
   MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
@@ -2281,7 +2283,7 @@ in with self; {
   MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
   MBESS = derive2 { name="MBESS"; version="4.6.0"; sha256="1fc2zcjfk9k107bl3fs3wf8fxxrcpwyhiz7j1iv3w6zqf2l4fb88"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; };
-  MBHdesign = derive2 { name="MBHdesign"; version="2.1.5"; sha256="0hq6i4qwwcmyjf8h1lwdr54ph8d2rb6kgjida0wfn1bs4v0p1h4s"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
+  MBHdesign = derive2 { name="MBHdesign"; version="2.1.6"; sha256="188kx7594qsxq5wnkpzh3xm6rjvsyj5r4hv8kqaa2mcqp5730k1j"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
   MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.4"; sha256="0d5fi1i2sr39z5fdl303rjhxvp5h622zbkpfsv3yjq4vp0ymwka0"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; };
   MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.2"; sha256="13742y17aclqbsbc039vlnmrg5sa1y6kjsdayl8ii9xnhbb5f48l"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; };
@@ -2300,9 +2302,9 @@ in with self; {
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.29"; sha256="1d37rk10zi2yymsxif9091z9lnav7p4cazjfq29fhj90x8vpifhk"; depends=[ape coda corpcor cubature Matrix tensorA]; };
   MCMCpack = derive2 { name="MCMCpack"; version="1.4-5"; sha256="1dfz3impsb70nq7qyk5aj5ixslj2zvwcl1mfqvqzy6zp8kx9r56s"; depends=[coda lattice MASS mcmc quantreg]; };
-  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.9"; sha256="1zmlz2kwrp1qiyvq3v5vv1rsy3s2idlifmckmgznk4nkqds5ifwh"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; };
-  MCMCvis = derive2 { name="MCMCvis"; version="0.13.3"; sha256="167j3qjkiwji0vgww7q2byj39hxzhf6jpln9rhhm384y4ycpabys"; depends=[coda overlapping rstan]; };
+  MCMCvis = derive2 { name="MCMCvis"; version="0.13.5"; sha256="0pgihhmizp8dq9fb23ln2m2rbj97r2433n16krji3cm9ji33wndd"; 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]; };
   MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-0"; sha256="1660r7ibgj5jl5nf3p11911n8k3wbnnzagapn73f2g5racwrbx1d"; depends=[DoseFinding MASS]; };
@@ -2319,8 +2321,8 @@ in with self; {
   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=[]; };
-  MEDseq = derive2 { name="MEDseq"; version="1.0.0"; sha256="1pac9g6pmh5wn5mm48vdbn5rbd0c02z28xqkbdrklf3wcxf4b2qd"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; };
-  MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
+  MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; };
+  MEDseq = derive2 { name="MEDseq"; version="1.0.1"; sha256="13b41hs2s3syb8xbxjdpfk8gh40jv3gxd4dnfwz0mixfppwd5kd0"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; };
   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-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; };
   MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; };
@@ -2332,12 +2334,13 @@ in with self; {
   MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; };
   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.3-2"; sha256="1p467zc8lvdcl8n0mf6aazm39flbn62ykwc6c6brkxy46cdvc5jv"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
+  MFPCA = derive2 { name="MFPCA"; version="1.3-4"; sha256="18wbas1g848865di96a19kmv0fsnds7cfv81nwhz6l6q8qmlnkf6"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; };
   MGBT = derive2 { name="MGBT"; version="1.0.2"; sha256="0jgdy8zw5lx2f567n3livgmwhpfcd1s42mp1bj859jx3z5kiwkiy"; depends=[]; };
   MGDrivE = derive2 { name="MGDrivE"; version="1.1.0"; sha256="16nm47vazd06hvi4k3z86lxilgk8y4b3p44h6cm2b8az90irmj5f"; depends=[data_table R6 Rcpp Rdpack]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
   MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; };
+  MGMS2 = derive2 { name="MGMS2"; version="1.0.1"; sha256="0pai8cf4czsscsw35plrqldmqryzn6zji41n4a3x73cr00msfxrb"; depends=[MALDIquant MALDIquantForeign]; };
   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.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; };
@@ -2357,7 +2360,7 @@ in with self; {
   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=[]; };
   MKdescr = derive2 { name="MKdescr"; version="0.5"; sha256="0dgdglr173pjlvbh9kd67pl890pnlzlcfm04ax4bdas6gp1cb6j6"; depends=[ggplot2 scales]; };
-  MKinfer = derive2 { name="MKinfer"; version="0.3"; sha256="0d2kp7q9nj7cg99178byanfsvzp6xajhh07wxy59d70anbh7a9hz"; depends=[arrangements boot MKdescr nlme]; };
+  MKinfer = derive2 { name="MKinfer"; version="0.4"; sha256="1rs0vjq9d5hhrlw98vxnss4ph8hyqws4wx4wlikfqpp42v96yxl4"; depends=[arrangements boot ggplot2 MKdescr nlme]; };
   MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
   ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; };
@@ -2365,9 +2368,10 @@ in with self; {
   MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; };
   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]; };
+  MLGL = derive2 { name="MLGL"; version="0.6.1"; sha256="01z4gc1zhhyiin58dm5mwr9x799gq73agh4s10wk4q82f0nn3f55"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; };
   MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
   MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; };
+  MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
   MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; };
   MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; };
@@ -2381,8 +2385,9 @@ in with self; {
   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]; };
-  MMLR = derive2 { name="MMLR"; version="0.1.0"; sha256="0gir1adflxkmz3qfpy2xkx434phzszsylzw38vdgicmdic1m2ywq"; depends=[matlib]; };
+  MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; };
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
+  MMVBVS = derive2 { name="MMVBVS"; version="0.8.0"; sha256="08nkhrf62yywpm0nw22pqzlcm72sf4zq44640a7pf57bbzm38ccy"; depends=[ggplot2 Rcpp RcppArmadillo reshape reshape2 rlang]; };
   MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; };
   MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; };
   MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; };
@@ -2411,7 +2416,7 @@ in with self; {
   MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; };
   MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; };
   MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; };
-  MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+  MPTinR = derive2 { name="MPTinR"; version="1.12.0"; sha256="0iv7hy0lmxadw34cq4gsb5i2my8lbvdfp23qadhiw6ca179hgamy"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.3-3"; sha256="0wl5ww7ii8vbgg3680zh3y5pqz1ipfnhjka1lz62fmp3rs09zmfq"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
   MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; };
   MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
@@ -2430,7 +2435,8 @@ 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.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
-  MSEtool = derive2 { name="MSEtool"; version="1.4.0"; sha256="172jsgkcp955pssgby6vvaqrlxp371b1i60fd6w2i901jkja3fdz"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; };
+  MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; };
+  MSEtool = derive2 { name="MSEtool"; version="1.4.3"; sha256="1r4bnw49hhriwrgg1pkg6gkq789c63bhsp71srrf5fv7jna8z0zk"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; };
   MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="2.31"; sha256="15df35l5nr6cl3q7xprl6ifswh7mg1fvix1x9374qgyafwr40sq4"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
@@ -2459,17 +2465,17 @@ in with self; {
   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=[]; };
-  MVTests = derive2 { name="MVTests"; version="1.1"; sha256="13q9bfzbcf2gz5mhp5rjja5d0k0m78f0253ziwrlg5ncyf2d8q0c"; depends=[matrixcalc]; };
   MVar = derive2 { name="MVar"; version="2.1.1"; sha256="17fj2y739afmdrbhnd2la9qiywcyyk0nr1d8936c63nz8xivvssv"; depends=[MASS]; };
   MVar_pt = derive2 { name="MVar.pt"; version="2.1.1"; sha256="0jzsiawisr0378n9ph7s2c2j64xybf9mz00zriw38cjr1lxaqrnf"; depends=[MASS]; };
   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]; };
   MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; };
+  MXM = derive2 { name="MXM"; version="1.4.5"; sha256="003068bq8lmc29pc6ac9yaskjiqalvhngacac4fnl705l58zhcyg"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; };
   MaOEA = derive2 { name="MaOEA"; version="0.5.2"; sha256="1yaa8wr1gr1npqpls5g6mlr9dgjwiyvhk6p1dmjw29f7a4g2cam5"; depends=[e1071 gtools lhs MASS nnet nsga2R randtoolbox reticulate stringr]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   MachineLearning = derive2 { name="MachineLearning"; version="0.1.3"; sha256="0yvrsqzvx8ss614ixa9mwkg2ig3hmfixm78fi8c3wmpc2frvsqrk"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; };
-  MachineShop = derive2 { name="MachineShop"; version="1.6.0"; sha256="1kdqicj6f5ivg01qp69wm1liwl6x2dqvm9va728w524h4m0361wj"; depends=[abind foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; };
+  MachineShop = derive2 { name="MachineShop"; version="2.0.0"; sha256="0whn6xp5339vbsjfs40lq1kz1pizzaaryfg8bgcscqfr4rlxs3av"; depends=[abind dials foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; };
   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=[]; };
@@ -2483,29 +2489,28 @@ in with self; {
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; };
   MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; };
-  MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.1"; sha256="1dz5ig16yz5n8i1dqrbg5xjigryznk61br80fj20prq4qhsdsqi6"; depends=[gtools matrixcalc sandwich]; };
+  MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; };
   MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; };
   Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; };
-  MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; };
   MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; };
   MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; };
   MatTransMix = derive2 { name="MatTransMix"; version="0.1.6"; sha256="07npn31abksi17s8g1cgxnciyw2nm1mzfmbys3kfkgb8nqq0d6g2"; depends=[]; };
   MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; };
   MatchIt_mice = derive2 { name="MatchIt.mice"; version="3.0.1"; sha256="04c078fz7s0wll4wizi0mj4s3gdx1kpr5g40gq7znn362z7q25ym"; depends=[MatchIt mice]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
-  MatchThem = derive2 { name="MatchThem"; version="0.9.0"; sha256="166wvf43vyl2bn0qcqmlz4nk4hysafiid7imr7d699mrg2g2p7db"; depends=[dplyr MatchIt mice survey WeightIt]; };
+  MatchThem = derive2 { name="MatchThem"; version="0.9.1"; sha256="07sby3jyf3v7dmcm3pzjamsj5c6jfc65n1xdvakbd7nmlignb1m3"; depends=[broom dplyr MatchIt mice survey WeightIt]; };
   Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; };
   Matrix = derive2 { name="Matrix"; version="1.2-18"; sha256="06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp"; depends=[lattice]; };
   Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; };
   MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
-  MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; depends=[]; };
+  MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; };
   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]; };
   MaxMC = derive2 { name="MaxMC"; version="0.1.1"; sha256="0n6m5h8n3gwmlqq563rpdx4l8ldzl6jx3ga50ygvlnamdj3wjqgm"; depends=[GA GenSA NMOF pso scales]; };
   MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; };
-  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.0"; sha256="168qi75r75fjwbarz8kj50ba43as6b15iarhni61sc4zf92lh2da"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.2"; sha256="1p79wc3f1mcv9nlf8z277h1vzxl33w48knhn0yrw902vr5a0lzhf"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; };
   MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; };
   MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; };
   MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; };
@@ -2519,24 +2524,23 @@ in with self; {
   Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
   Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.1"; sha256="01irc5qnw7gsvnpifki05ksh7ys8znk0wvhqrzk1bv5294rnq6r1"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; };
-  Mercator = derive2 { name="Mercator"; version="0.9.5"; sha256="0lmmc9w9mwmbf8vyddw21imv9j5pjrz92n74xk304dxwyc5smfi1"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; };
+  Mercator = derive2 { name="Mercator"; version="0.9.6"; sha256="09fk9cmnd636hnbhh3f1swmfk4j6nxfbz42hi2ylpriq7ygp7jq5"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; };
   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.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]; };
-  MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
   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.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.1"; sha256="11jblzqid9xyigj916filclk8ih15g04r58msb7lwlh9srn4hjw4"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; };
   MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.6"; sha256="1m7i1y9jmhwa3h3xbqqlskgr216x50jb4wx8n3ynh16hw54n07xi"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
-  MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.5"; sha256="0i9m9j8i9z9qxiaqbjik93ynnjx1xi1n8b6ndx4h2k46n5mg4pi7"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; };
+  MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; };
   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]; };
   MetaSKAT = derive2 { name="MetaSKAT"; version="0.71"; sha256="1bfy1zqblwz7a9fr9i6hs18x2n422x52b928v77r3924nasa67a8"; depends=[SKAT]; };
-  MetaStan = derive2 { name="MetaStan"; version="0.1.0"; sha256="12r76wrspsz2c8pys0b0s117h514qch776969fbz94w6gjhv3km4"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  MetaStan = derive2 { name="MetaStan"; version="0.1.1"; sha256="0sln7hr892npq508qbswhnpx27vjd5qnh81glazma5m3k2li53jb"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; };
   MetaSubtract = derive2 { name="MetaSubtract"; version="1.50"; sha256="1aggkvpyl2zpnmqzrr7k22wmb4dyagljcwrkm956nbyvlzx4sx2x"; depends=[]; };
   MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; };
   MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; };
@@ -2546,14 +2550,14 @@ in with self; {
   MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.1.0"; sha256="0pi3pdl1wz8lbj47d0rvgrrdc72bffjf9q07dp92qx2857pppwz8"; depends=[ggplot2 glmnet gplots matrixStats pls Rdpack rms superpc survival survminer tidyr]; };
   MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.1"; sha256="13q8s96s71g7nyr6mi5q7jwmf4vx3pcr8l9ixqlc8hglnkd0y6rk"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
-  MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; };
   Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
   Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
+  MethComp = derive2 { name="MethComp"; version="1.30.0"; sha256="1vmwb4zw4gm2x0j2nzm2vjfj7x19ws8njr6dcglzjpbbha7nxjp6"; depends=[coda nlme rjags]; };
   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.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; };
-  MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.4.0"; sha256="04j3cf6p9nzxcd6q5cd3asz13707rxyg5rd2qv76zsdgm10ys6mm"; depends=[]; };
+  MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.0"; sha256="0i9wla42i5p9yqjsrhjylyfszxl7p3k4yfwkvqsw9ncak611ig9x"; depends=[]; };
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
@@ -2565,11 +2569,11 @@ in with self; {
   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]; };
+  MigClim = derive2 { name="MigClim"; version="1.6.1"; sha256="116zsmir0hz6ah3qwsr8bb8qhhfzvg1rciwm8a6lq02mvw0v0vrn"; depends=[raster]; };
   MinBAR = derive2 { name="MinBAR"; version="1.1.0"; sha256="03hzv6a56w0d6di3jp3w3fgckwxkqb1cy3xiwcvzyg5lzm4z9p2x"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
-  Minirand = derive2 { name="Minirand"; version="0.1.1"; sha256="15mp9vjb40a9v26lk82361bnmbf8pwgnr9pk4j49hhf6mhb01znr"; depends=[]; };
+  Minirand = derive2 { name="Minirand"; version="0.1.2"; sha256="1p4b1lq4iqvg335wp7mhvr0m23k69vnhw99kyn3ys0brf7889dgc"; depends=[]; };
   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]; };
@@ -2582,27 +2586,24 @@ in with self; {
   MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; };
   MixSIAR = derive2 { name="MixSIAR"; version="3.1.10"; sha256="0kc0apzl6aq9qjgrnnad78k71g91hzc1d7f3j0s1kpwzax2q6l2l"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 rjags]; };
   MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; };
-  MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; };
   MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
   MixedPsy = derive2 { name="MixedPsy"; version="1.0.0"; sha256="19cgw82jdkcpkca90bab1k5gcb2prlxm634n4m7yx0p0mj736fha"; depends=[beepr boot brglm lme4 Matrix mnormt]; };
   MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; };
   MixfMRI = derive2 { name="MixfMRI"; version="0.1-0"; sha256="08k8j52mrjpcrnwz74va4w3cdfrbkzp00wdzrrrzifx7lcmxrqzv"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; };
   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.4"; sha256="063jc7x2ra0maln39a2w9jjzycac6rkqb96wjnmk36x7vb6z4xy1"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; };
-  MmgraphR = derive2 { name="MmgraphR"; version="0.3-1"; sha256="0nfv2cax2v2zhsbprwykngq5n6i5qcf8189rci9d48d5k9qm4a5r"; depends=[colorspace march msm TraMineR]; };
-  MoEClust = derive2 { name="MoEClust"; version="1.2.3"; sha256="1bkknlp49bcx4s2lpdqwpqn5f5rr90lah0zkvmkih309rayirjr3"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
+  MoEClust = derive2 { name="MoEClust"; version="1.2.4"; sha256="1w54kfwc4l0fha63mgy7khqiikck9ffhyv9yy0icx3g03hkwmfky"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
-  MoTBFs = derive2 { name="MoTBFs"; version="1.1"; sha256="0cr36yqxbibfcz9swmh7znl1dq4zfighnh6r3fcbnd1kxf45d745"; depends=[bnlearn ggm lpSolve quadprog]; };
+  MoTBFs = derive2 { name="MoTBFs"; version="1.2"; sha256="1k5xyz93bf10wslrbqygdhm9z14dfl53xzd2fcyjc4xgjzfv1v3b"; depends=[bnlearn ggm lpSolve quadprog]; };
   MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; };
   ModStatR = derive2 { name="ModStatR"; version="1.3.0"; sha256="1wdqkvbycjk4wzzkpc0pyxvxrzqm48xbi8y87nax5l1v5qdfm1n0"; depends=[BioStatR boot ellipse ggplot2 gsl hypergeo jmuOutlier]; };
   Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.4.0.1"; sha256="1279k5hznxrb6fq4zd1baw1pm5dj5437g5awkgb8kp7ll8raa2ql"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
-  ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2"; sha256="158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6"; depends=[data_table Rcpp]; };
+  ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.1"; sha256="17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc"; depends=[data_table Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
-  MomTrunc = derive2 { name="MomTrunc"; version="4.59"; sha256="1z4nd5c9443az69k55xb9r2v4slagl8dr60jq9frfi3v3ilmr7c6"; depends=[mvtnorm]; };
+  MomTrunc = derive2 { name="MomTrunc"; version="5.63"; sha256="0kyz4cplkd7yhls78x08fla7yciv5103xr7j8b5gnpv0ncbhhzd4"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt tmvtnorm]; };
   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]; };
@@ -2616,18 +2617,17 @@ in with self; {
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortCast = derive2 { name="MortCast"; version="2.1-2"; sha256="0p5cjzrl3yhrbhjr31fm84rj7dl7n65qzccj447ky1lvb4c0v2x1"; depends=[wpp2017]; };
   MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; };
-  MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.2"; sha256="0bdivv1qxk3ckpqa5n6fhwy8m0i24f8q84iaijv0k8xrq63056ls"; depends=[minpack_lm pbapply RCurl tidyr]; };
+  MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.3"; sha256="1k3wamxgrsl08sfymfqhlgal38nxxgqfibqkh1qkmm4006pp7xx3"; 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-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; };
-  MplusTrees = derive2 { name="MplusTrees"; version="0.0.1"; sha256="1jmxaxpzccnn5qpc138z7mr89s0ia9kc8wrsa1n6c2d3x4jzmms9"; depends=[MplusAutomation nlme rpart rpart_plot]; };
+  MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; };
   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.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr 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.43.6"; sha256="0g8ba1lzn7k9bn0jzay5phcgkzv7bdwpkzm0sxwwvsfyg3igy4f8"; depends=[Matrix nlme]; };
+  MuMIn = derive2 { name="MuMIn"; version="1.43.15"; sha256="1xp0r7yqvll90jv7i5jx142vj5pmfpfmmn6i9a7kgqx26yzpq87h"; 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]; };
@@ -2635,7 +2635,7 @@ in with self; {
   MultNonParam = derive2 { name="MultNonParam"; version="1.3.0"; sha256="13xkwyvqqjvs5nv383y3hy1w0mz2qmqwih5rh9dqs7r7afx7928n"; 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="1.0.0"; sha256="1i15m30bnydxyghp8jpfr6rs2gnilbw38d6ifs2jzdr83qbxyls3"; depends=[data_table Rcpp RcppArmadillo]; };
+  MultiFit = derive2 { name="MultiFit"; version="1.0.1"; sha256="1hy2xsmdcsn4jwa06ffymhhd4prxjnqw0jxl77sxq8yb1fc2vk64"; depends=[data_table Rcpp RcppArmadillo]; };
   MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; };
   MultiJoin = derive2 { name="MultiJoin"; version="0.1.1"; sha256="0cfk6yc5jagj9y8xybw6yg0yph4zah2vzaxv0384ad6r0r3x3nm8"; depends=[]; };
   MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; };
@@ -2659,7 +2659,7 @@ in with self; {
   Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; };
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; };
   N2H4 = derive2 { name="N2H4"; version="0.5.4"; sha256="1sdxfi4618q9kz18ns1i1i2g5r0c4b6ydijaaxr21z206zi5i5wb"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; };
-  NACHO = derive2 { name="NACHO"; version="0.6.1"; sha256="14aypwfgal975qy6i5ffjg9p154xaqaaznkdikj0iw5ah9w9n3fw"; depends=[dplyr ggbeeswarm ggplot2 ggpubr ggrepel gtools knitr magrittr rmarkdown scales sessioninfo shiny tibble tidyr]; };
+  NACHO = derive2 { name="NACHO"; version="1.0.0"; sha256="0mnkfg45bcnrpxq3q7qpzw8kr5k6kdqd6022n0ld7m3wg9bwxzpb"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; };
   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.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; };
@@ -2684,7 +2684,8 @@ in with self; {
   NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; };
   NFP = derive2 { name="NFP"; version="0.99.3"; sha256="18alq3nb47jyz0dh54y536a0igkfbh2x5nf2jxryfnizr47qc3a5"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; };
   NFWdist = derive2 { name="NFWdist"; version="0.1.0"; sha256="0833lg0pd763awrc6ibidwf2ldl79w9lmm5acq4bnpd2hzsx60l8"; depends=[]; };
-  NGBVS = derive2 { name="NGBVS"; version="0.1.0"; sha256="0ap8hq3n8xxlvp20f90prksy6lfnrwqb3k32npnx3d78j1cd7qdq"; depends=[ghyp Rfast]; };
+  NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; };
+  NGSSEML = derive2 { name="NGSSEML"; version="1.0"; sha256="1kwdziv2rdswbjq2rir2a6yw6ldnck1z7hahyywvw0kbm5fkb4zq"; depends=[car dlm fields interp mvtnorm]; };
   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=[]; };
@@ -2697,8 +2698,8 @@ in with self; {
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
   NITPicker = derive2 { name="NITPicker"; version="1.0.1"; sha256="00jmin7y1bp7a4a1qcvv3rkgiy9qij7gbkxcdgpiyzcs6aaif59z"; depends=[fda fda_usc fdasrvf]; };
-  NLMR = derive2 { name="NLMR"; version="0.4.2"; sha256="1xvms8lllp020ybv9yyc0rpvbyps00ghy0xgk3kmws44bwyzn23l"; depends=[checkmate dplyr fasterize RandomFields raster Rcpp sf spatstat tibble]; };
   NLP = derive2 { name="NLP"; version="0.2-0"; sha256="0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w"; depends=[]; };
+  NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
   NMAoutlier = derive2 { name="NMAoutlier"; version="0.1.13"; sha256="0d3mg92ky5mhjz6y1903ssanl1lzq4q22yifgjyq29j9snx0jkx1"; depends=[ggplot2 gridExtra MASS netmeta reshape2]; };
@@ -2709,11 +2710,10 @@ in with self; {
   NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; };
   NNLM = derive2 { name="NNLM"; version="0.4.3"; sha256="0p7p26070w2j57z5i89pmpgd470yh2z0rrfzpalzdngc8mzp2rkj"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; };
-  NNS = derive2 { name="NNS"; version="0.4.7.1"; sha256="10hb06wdd8fn0rp32hagaqf19ig4fi16rd8l3h888vlzfwfrw83w"; depends=[data_table doParallel rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.4.8"; sha256="09wdq55i8csnmj72dwm0ksmwnzh81w8ry7s55iq18sh7n3j4npn8"; depends=[data_table doParallel dtw rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
-  NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
   NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
   NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.2"; sha256="0fxcs2l6g1gkvydl04ippkq192jn0zl2c304ww4hczzpvn7l8lsp"; depends=[Rcpp]; };
   NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; };
@@ -2734,7 +2734,7 @@ in with self; {
   NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.3.4"; sha256="1bkzmm573ic6xrsqbbln865rfw2xnmby632m3jcgamddxppx3fjf"; depends=[]; };
-  NTS = derive2 { name="NTS"; version="1.0.1"; sha256="12kv49mkkqv4hqm784vgvhxbvs9jdsg4n54x0qdhfxv26n3a0fvm"; depends=[dlm MASS MSwM Rdpack tensor]; };
+  NTS = derive2 { name="NTS"; version="1.1.0"; sha256="0sjzc42whb9wr0w6r8qis89sjcfqwci5wnm3ndxxvfhg6x6skmi3"; depends=[dlm MASS MSwM Rdpack tensor]; };
   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]; };
@@ -2749,7 +2749,7 @@ in with self; {
   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.6"; sha256="02i9jd6sksxkbnm3ldadp1xfmhkb27n5ahhgs70fg2g5nhc2jxs9"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; };
-  NetMix = derive2 { name="NetMix"; version="0.1.4"; sha256="0sl5wrb86fvrjrq1qj3w2c7qg052y07wai53w0az2rfs1slf0af9"; depends=[clue gtools igraph lda Matrix Rcpp RSpectra]; };
+  NetMix = derive2 { name="NetMix"; version="0.1.5"; sha256="1s6h5d34fd6brpiank2mpvpscvsgw86zfyq677s8nh8bkrc4idzs"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo RSpectra]; };
   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]; };
@@ -2763,23 +2763,23 @@ in with self; {
   NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
   NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.3.2"; sha256="0dh9c2iwvg3mn6gfi3yihf2436bzl3vqhav22n2q6amq17b5p3va"; depends=[corrplot doParallel fdrtool fitdistrplus foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab wTO]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.3.3"; sha256="1i9kdwd989l53fcx59yg9ac9bi5calj978pgif0rnz8vv4vvsgm2"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
-  NeuralSens = derive2 { name="NeuralSens"; version="0.1.0"; sha256="1ay8jvdm2rc5z8y761mk1l5yszcxixiwin0dr91f9dzws3yjlkrg"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 stringr]; };
+  NeuralSens = derive2 { name="NeuralSens"; version="0.1.3"; sha256="0xgn5x8vjfv0k3skyjm5j9wi0qfnmhdpfmg5q7564zylyjb0kvsh"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 stringr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
   NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
   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.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; };
-  NlinTS = derive2 { name="NlinTS"; version="1.3.7"; sha256="0s3ij6l1j2gs6adq6mrcbv6g10kda4sc0pg9y89nm0djhfa8zyly"; depends=[Rcpp Rdpack timeSeries]; };
+  NlinTS = derive2 { name="NlinTS"; version="1.3.8"; sha256="0wbwn33k774ib2849hr39fh89003jwpzimwlj1082zmjvssblc5c"; depends=[Rcpp Rdpack timeSeries]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
   NonCompart = derive2 { name="NonCompart"; version="0.4.5"; sha256="0z2iigr8nsyanx9lnf7hq5d5fbnm1kd3ir2scfhaqafxa8y8byq9"; depends=[]; };
   NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; };
-  NonProbEst = derive2 { name="NonProbEst"; version="0.2.2"; sha256="0rkdl81l6rnxg36h0qqwwpvsqa9c64yc3gld3xynq4z0flvnqwkq"; depends=[caret e1071 sampling]; };
+  NonProbEst = derive2 { name="NonProbEst"; version="0.2.3"; sha256="0wpqsz06c5v42xijh7imv9fxz9p01354pw7s91sjn6m12w2a2d0z"; depends=[caret e1071 sampling]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
   Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; };
   NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
@@ -2790,13 +2790,14 @@ in with self; {
   NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  Numero = derive2 { name="Numero"; version="1.3.3"; sha256="0n4mi354g1a7v5lczc1ax9yykv2h3dg6kcy2f67wzzwvgbjgz691"; depends=[Rcpp]; };
+  Numero = derive2 { name="Numero"; version="1.4.0"; sha256="11fviqs5smbb33qjqc463w5dz8avmba3243wcadj87j60rclqnri"; depends=[Rcpp]; };
   NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; };
   OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
   OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; };
   OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; };
   OBsMD = derive2 { name="OBsMD"; version="5.3"; sha256="10acj6d0nvf1zyirp001c2fhsg2gq33zywnp8w70gm1dk7pgzfzr"; depends=[]; };
   OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; };
+  OCNet = derive2 { name="OCNet"; version="0.1.1"; sha256="0s6r57flkgjj1j5lmgd2w34x0hifx3ia1h9sknk7i6l93w2w0a2y"; depends=[fields igraph rgdal rgl sp spam SSN]; };
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.1"; sha256="0j6kw32hq9gfiwmyh4zxx7ibfxplhass7q309y8r656lkhvr9nin"; depends=[checkmate deSolve]; };
   ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.2"; sha256="0yddv5h3y0xfviqjgrbixawd00jc1rh9ngckfqka5j855vhchh66"; depends=[checkmate deSolve ODEnetwork sensitivity]; };
@@ -2827,12 +2828,12 @@ in with self; {
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
   OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; };
   OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; };
-  OUwie = derive2 { name="OUwie"; version="1.53"; sha256="0a5p6l56q79y22lcj9nn6ap6q7l56nxy6jhinrahdvchicsdpk8v"; depends=[ape corHMM corpcor expm geiger lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
+  OUwie = derive2 { name="OUwie"; version="1.57"; sha256="0faqyvap8jcz6k08k71lszns2h67csgd7q4s12fml153fm3lsjx9"; depends=[ape corHMM corpcor expm geiger lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
   OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; };
   Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="3.0.1"; sha256="1qc5zdxjdfayr9x239rrpc27rqnildix0mvc7p13ik5gzzddsxqr"; depends=[measurements outliers rgdal rgeos seg spdep]; };
   Observation = derive2 { name="Observation"; version="0.2.0"; sha256="0v81manzcvv8x9hbf75c8klslzdabha53rasyba91vvcbrshhq6j"; depends=[AGread svDialogs]; };
-  OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; };
+  OceanView = derive2 { name="OceanView"; version="1.0.5"; sha256="11gq15v3blisplbi6q6jgfsjbnbmfnyxdz8pq1ny9vgljzninvn1"; depends=[plot3D plot3Drgl rgl shape]; };
   Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; };
   OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; };
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
@@ -2841,7 +2842,7 @@ in with self; {
   Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; };
   OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; };
   OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; };
-  OncoBayes2 = derive2 { name="OncoBayes2"; version="0.5-4"; sha256="0y6kqqv93bh1skr8cm95saycs2k9jxq8nhkf8cc29p3nak205f7c"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; };
+  OncoBayes2 = derive2 { name="OncoBayes2"; version="0.5-8"; sha256="1nww1bshjg04zamh2jgmallm97xhdqs8vs7pbf3x8a7p2i3lcvnm"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; };
   OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; };
@@ -2852,7 +2853,7 @@ in with self; {
   OpenImageR = derive2 { name="OpenImageR"; version="1.1.6"; sha256="1yl7xvb86vxyf8d5g58hhmrva0gyg8iabb9npsdlnl8j0bg5gfiw"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; };
   OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.15.4"; sha256="012iclwgh9amhhbxg90ghfjv5iwv8w25brwwp3gbas5qlwygk61a"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.15.5"; sha256="1wbzhmyb1lnk39dkcyccmblxvniwsghh0jd94x05pk6yrcq8im5v"; 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.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
@@ -2862,7 +2863,7 @@ in with self; {
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
   OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; };
   OptSig = derive2 { name="OptSig"; version="2.0"; sha256="1d5baq6zq5vkklg8sabzs9kril95swvqd6fzkfywixsqnyywcvvm"; depends=[pwr]; };
-  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
+  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
   OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; };
   OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; };
@@ -2882,15 +2883,17 @@ in with self; {
   OutlierDetection = derive2 { name="OutlierDetection"; version="0.1.1"; sha256="0z4797j2gr37c1jnhivczff3y2dd2kilyncc087ihpwaa26wv0nl"; depends=[DDoutlier depth depthTools ggplot2 ldbod plotly spatstat]; };
   OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; };
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
-  OwenQ = derive2 { name="OwenQ"; version="1.0.2"; sha256="00c8cv8bawmlswjhqrhb218vvl7k7ljw85iwbwwrhxf3hpm9mcz3"; depends=[BH Rcpp RcppEigen RcppNumerical]; };
+  OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
   PAC = derive2 { name="PAC"; version="1.1.1"; sha256="07f83i43nxf1s2c26kkpcv4iyq517w20y1l7yg41wnmbfi9xlk7s"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
   PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; };
   PACVr = derive2 { name="PACVr"; version="0.8.2"; sha256="0bqv0zhcyp5v1wln11kkvygdwd70yrixd9cbm5fvjqkmmdvmnrv0"; depends=[BiocGenerics genbankr optparse RCircos]; };
-  PAFit = derive2 { name="PAFit"; version="1.0.1.4"; sha256="0lm12dsqz88v10qdk5pyf4a4nv3kk9za8zbnmw761fk330ill045"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PAFit = derive2 { name="PAFit"; version="1.0.1.6"; sha256="134dl2hdk8nk0bkjzlln1k9q07m9cfnxqgs4p9sk4r6rwxza5xpg"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PAFway = derive2 { name="PAFway"; version="0.1.2"; sha256="1sdfw9j6pzbnnhh3ghx7vkynd3523ayaimmpkidb300hdkblln6a"; depends=[GGally ggplot2 gplots igraph network scales sna]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
+  PAMA = derive2 { name="PAMA"; version="0.1.0"; sha256="19mz37h1kcfff7fkshg6qzgwm9vqgbzwjkcs5ydd1v6xq37lzapm"; depends=[mc2d PerMallows]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
   PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; };
   PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; };
@@ -2901,14 +2904,14 @@ in with self; {
   PATHChange = derive2 { name="PATHChange"; version="1.0"; sha256="1pmxhaych01cywx9bb5z0p5lbxcma7x6nlprivpx3gnpg7m9srpg"; depends=[rlist stringr VennDiagram]; };
   PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; };
   PAmeasures = derive2 { name="PAmeasures"; version="0.1.0"; sha256="0c2pkms06lijly9clxp6zkasqy4zjicdwnvbqwvhp45yavwmkkkj"; depends=[survival]; };
-  PAutilities = derive2 { name="PAutilities"; version="0.3.0"; sha256="0lx9z92127sqwsgfs2bl8cacpgncs2ignr53l9pclyln9iwdfg5v"; depends=[clues dplyr equivalence ggplot2 lazyeval lubridate magrittr matchingMarkets reshape2 rlang]; };
+  PAutilities = derive2 { name="PAutilities"; version="0.3.1"; sha256="1jl99z3bwn6n7f3g3xn37z3080gkj7z2aiai3rvvicxcjj9vc3c3"; depends=[clues dplyr equivalence ggplot2 lazyeval lubridate magrittr matchingMarkets reshape2 rlang]; };
   PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; };
   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="1.1.4"; sha256="11dxy6rdhwairymigwqxd51hxz82011sx0gzzphcs6i4gr0c54c3"; depends=[PBSmodelling]; };
-  PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.4"; sha256="0ks3r4rw6dblmpbwwp57dh8f391qpjsbkpwcxcsvhqddcxacwzq6"; depends=[]; };
+  PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.6"; sha256="0570q1h91695qw9gnkv3d2bip40pzaapy66042qac4yjsg7wca2z"; depends=[]; };
   PBSmapping = derive2 { name="PBSmapping"; version="2.72.1"; sha256="0xri8in9631w7qd2m38614al90lr6hak6jh28hcsa8ihdp5azciy"; depends=[]; };
   PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.8"; sha256="07qaqb6sd1idmryxlz0gxb4d3apzql9vp4b16nazba08ksx0y7wf"; depends=[XML]; };
   PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
@@ -2921,11 +2924,10 @@ in with self; {
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
   PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
-  PCMBase = derive2 { name="PCMBase"; version="1.2.10"; sha256="0q84dd9a59c8pzv4pabcxlxxn37pxm5ya5pa800d3m34fd02h8i3"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; };
-  PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.7"; sha256="0sri6aqbx1bx32342j20jchsp4v4r7hl6xwcxidxph3ivixzn7qj"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; };
+  PCMBase = derive2 { name="PCMBase"; version="1.2.11"; sha256="010188p7f4nr5jxayq02a8q2r23a9w9rd6njxckca99d903cpwg5"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; };
   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="1.0-2"; sha256="08c8na83q0vynm3a1xz7r9ah7x33kwq4mjyfnqk46p6i3p1snqwm"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; };
+  PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; };
+  PCRedux = derive2 { name="PCRedux"; version="1.0-4"; sha256="1p62brjmvpahxksjnmlfp8flk4yscpvl0g0j5alwp6wqndn2qxcl"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny 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]; };
@@ -2939,12 +2941,11 @@ in with self; {
   PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
   PELVIS = derive2 { name="PELVIS"; version="2.0.0"; sha256="0n5ndnwxsixx5lipsq33i8f7wc78sb9a4b9bbblb72v5nmmq305p"; depends=[DT 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.4"; sha256="1arviyjmvbkiv4fwfs155360p3fnfqsdnhrjdn0r2pgzmsb66i1y"; 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.1.5"; sha256="1cf9qzb58mvlp1qh46wl405zrfgbaf1zjc4smgwb3djdkxyznw6d"; depends=[broom dplyr purrr rlang tidyr]; };
+  PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.2.0"; sha256="1x7wf1yhl2yvdmgv88z7ak6ihdjhyrm81wphnk2wpgsg6b4m9g12"; depends=[broom dplyr purrr rlang tidyr]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; };
   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]; };
@@ -2961,12 +2962,12 @@ in with self; {
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
   PLMIX = derive2 { name="PLMIX"; version="2.1.1"; sha256="05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; };
-  PLNmodels = derive2 { name="PLNmodels"; version="0.9.2"; sha256="0xrn1bkzj1bvbfgs0k7jkb8d10k3sh9r9s0lbwx0dgdbhny5gl6p"; depends=[biomformat corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr phyloseq R6 Rcpp RcppArmadillo tidyr]; };
+  PLNmodels = derive2 { name="PLNmodels"; version="0.9.4"; sha256="1a2rdh4hz6pj28ahzwygyd5l44wcsqhsl4rqrnbnlnzabvs6fp9n"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
   PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; };
   PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; };
-  PMA = derive2 { name="PMA"; version="1.1"; sha256="0vlz89rhm5jxcpv18cpxa396qkqf0ywxhjh17ldbgrnqgsw76r7w"; depends=[impute]; };
+  PMA = derive2 { name="PMA"; version="1.2"; sha256="0cmhkkkgwxi52cprxpx8kljfaz1a3pcinwcjp17b9j9xd9nd0kkv"; depends=[]; };
   PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; };
   PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.2"; sha256="0n71q8kcmk1ibqn0fq9p60xrxx1dg7hszn11i51cmsx9695wwk28"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
   PML = derive2 { name="PML"; version="1.1"; sha256="11fl7qm98n5wlfwczb6vzj9hswq7mqmb09nh9wl7986jp2wbrjlw"; depends=[dplyr rbokeh tibble tidyr trelliscopejs]; };
@@ -2980,7 +2981,7 @@ in with self; {
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
   POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-7"; sha256="1xxm293lmj22dsiaimivpd90xpwnrr36xa371zg6k6w05q4jjfn3"; depends=[]; };
-  POUMM = derive2 { name="POUMM"; version="2.1.5"; sha256="1d578c2ybp1sm6ljagdgr7zv3yx7jq2wmc6dal6l7wyhchj1nj87"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; };
+  POUMM = derive2 { name="POUMM"; version="2.1.6"; sha256="16yiymfaci9zklbx3klf3nn9xlf305mdbq5n1ccx4w7g7h0ivdi1"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; };
   PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; };
@@ -2989,15 +2990,17 @@ in with self; {
   PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; };
   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]; };
+  PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
   PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; };
+  PRIMAL = derive2 { name="PRIMAL"; version="1.0.1"; sha256="0rxhy2spvnzkggcawbrf8i2940vqy3rgpif6hnp9l3y17qnx07hq"; depends=[Matrix Rcpp RcppEigen]; };
   PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; };
   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.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; };
   PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; };
+  PROJ = derive2 { name="PROJ"; version="0.1.0"; sha256="0vxa0ysf0rs59vwx70ygr73m5rz77qrbv0jdrnxr502y6chz51ji"; depends=[]; };
   PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; };
   PROSPER = derive2 { name="PROSPER"; version="0.3.0"; sha256="1xrzsayrkna1njz77kwikzyyinfsny2jahv829w789698azr1ms4"; depends=[data_table]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -3005,7 +3008,7 @@ in with self; {
   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=[]; };
-  PRSim = derive2 { name="PRSim"; version="1.2"; sha256="0fjcf1hbnwi4z7sk67chvvvkzf0n2scb7z0mxdnyhd0ggbn9p7a9"; depends=[goftest homtest wmtsa]; };
+  PRSim = derive2 { name="PRSim"; version="1.2-1"; sha256="1d56yz51848dqn1936iy63bcjvl0kb0k04pdy0j5zynrghw0jkqx"; depends=[goftest homtest wmtsa]; };
   PReMiuM = derive2 { name="PReMiuM"; version="3.2.3"; sha256="1znr1swz73n1ws657dvv56y6crmqicfllbz460vaw8a0dnjiqsc9"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen rgdal spdep]; };
   PResiduals = derive2 { name="PResiduals"; version="0.2-6"; sha256="11r0zn626s701hprjy634a7d3v3sq6lmlzpamv02609fg8wjhy9h"; depends=[Formula MASS rms SparseM]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
@@ -3019,7 +3022,7 @@ in with self; {
   PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; };
   PTAk = derive2 { name="PTAk"; version="1.3-34"; sha256="0ylnag492v1n0pmzsz73w12frhv8c3r3dxgarf58ny0ir0i0ywvl"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; };
-  PTXQC = derive2 { name="PTXQC"; version="0.92.6"; sha256="1286yrbkkra4gwkx9rv40w568a2v5mngmr4yx76w02x37msa0dhg"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
+  PTXQC = derive2 { name="PTXQC"; version="1.0.0"; sha256="1jybr5smjnc2mm02f13gkcpapaxjqj8ajc6sswy9b23fbcbqzlkw"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; };
   PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; };
   PUPAIM = derive2 { name="PUPAIM"; version="0.1.0"; sha256="0lkfp1jlcf0m0h7hqvbcr0sq0kbdwpvqvz52rs8j5n7ywiky4q3i"; depends=[FSA Metrics minpack_lm]; };
   PUlasso = derive2 { name="PUlasso"; version="3.2.3"; sha256="07jf81q898833qswwairkv21dxlz7890219fdgnw3ywgp5kvlp41"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; };
@@ -3029,8 +3032,8 @@ in with self; {
   PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; };
   PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.100"; sha256="0fqzr5gng5miyslkxjkq0gmy1mi37bcjg8pb9vhs7dxa15dm332j"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
-  Pade = derive2 { name="Pade"; version="0.1.5"; sha256="12lq1ixh1axyalk7h86ris1s064v3dsc7p6xb868cm07qb132y36"; depends=[]; };
-  PairViz = derive2 { name="PairViz"; version="1.3.2"; sha256="01nzf7as848i3vpwgdm450x3f5lapfh2vgd59sy6qr80c19nfjl9"; depends=[graph gtools TSP]; };
+  Pade = derive2 { name="Pade"; version="1.0.0"; sha256="1z04fsm8mhlly5dmz6hxq0dqhh6fyk0wi6zf8vmfzxp9mw0zvmmy"; depends=[]; };
+  PairViz = derive2 { name="PairViz"; version="1.3.3"; sha256="0zhj4b33dahsyyw0jlnwn2swz2qislgphy8xn9lxdifb6iq7arbr"; 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]; };
@@ -3055,6 +3058,7 @@ in with self; {
   ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; };
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.13"; sha256="0yaf899yhia2773lkq5a16wz6srpsx7xzkbgf421ai2z90m23ddr"; depends=[backports BBmisc checkmate fastmatch]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
+  Pareto = derive2 { name="Pareto"; version="1.1.0"; sha256="07gvvcpcqr884xnd2kq4zn3c27h1xkx51qp1w3vfsqqccqdi08jw"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
   PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; };
   Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; };
@@ -3073,6 +3077,7 @@ in with self; {
   PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   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]; };
+  PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; };
   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.1"; sha256="05xhimjw7kdga07ycgwz6mq5ppcx04zy00mx5fvavp314zrqxnsv"; depends=[Rcpp]; };
@@ -3091,7 +3096,6 @@ in with self; {
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
   Phase123 = derive2 { name="Phase123"; version="2.1"; sha256="0bz867wsnrflzlzrql1vgacymx70rb9wik9jw3g34i2vigpl8x8i"; depends=[Rcpp RcppArmadillo survival]; };
   Phase12Compare = derive2 { name="Phase12Compare"; version="1.3"; sha256="1zrll0nx2z45sa5yzan4b59pqw9wgfqxpqv7njkpwim19c0damkl"; depends=[mvtnorm Rcpp RcppArmadillo]; };
-  PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.3"; sha256="1micildhgqx4h52927p68g6jvw2rif6maf90d3dzvn76ll2zbpwh"; depends=[cowplot 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]; };
@@ -3134,7 +3138,6 @@ in with self; {
   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.4"; sha256="0x9j9f9k65rfr4fxyrxqa9220psfh1bicls6vwbxmqsfdsfnvs0j"; 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.7.1"; sha256="1ym5i3j08wlv4r0gsjl2q6xvm2fd4bd2m95brhka13sja6qh6jd8"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
   PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; };
@@ -3147,9 +3150,9 @@ in with self; {
   PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.5.2"; sha256="1837pc94syhyl5i0kjdmlc1h7ckas3vcpwhvhgh46sv022lrg2gi"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.4-8"; sha256="0975y3q648cqfmz4pp79cfclww7v7mxmkz1limnyd2ahdsbbzyqn"; depends=[cubature mvtnorm TeachingDemos]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.4-9"; sha256="08qac2482v2b5s7nfhdn9x5gbl348yfwnzgqprh38qp16zzcylhg"; depends=[cubature mvtnorm TeachingDemos tufte]; };
   PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; };
-  PowerfulMaxEigenpair = derive2 { name="PowerfulMaxEigenpair"; version="0.1.0"; sha256="0729yphyvqy7i9mjx3swvijfhyrhh5y57qfwjwqwc4ncs18wm72r"; depends=[]; };
+  PowerfulMaxEigenpair = derive2 { name="PowerfulMaxEigenpair"; version="0.1.1"; sha256="1hzp3dpcac5han2ij4w0fwk093lr3pgydb39p848jj7jma5hawxs"; depends=[formatR]; };
   PracTools = derive2 { name="PracTools"; version="1.2.1"; sha256="1viwmwis9awr7maprnaj0vdzc5rf6md7xlc9l7hnn51xmaa734ih"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
   PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; };
@@ -3170,12 +3173,13 @@ in with self; {
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.6"; sha256="1lhk3lrspiqcw2ckss52gdjk1f6ph8m7dlb05qxcx8mycq0xd3z9"; 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]; };
+  ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; };
   ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; };
   ProcMod = derive2 { name="ProcMod"; version="1.0.3"; sha256="17x4c9vgf14l1x3hx3vyv3ygl8bb5qzq7fxg2cnl910drcdnv5sz"; depends=[expm foreach MASS Matrix mvtnorm permute Rdpack]; };
   ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
-  ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.1"; sha256="08hkb7hz0hj40ambg5li47ipjz1w2aybmcxygn5yknkl2k52j3gy"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; };
+  ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.4"; sha256="1lv1yf6xslskjqz7mgi8brvpix9g7k0yy6q03gckz1rmcakzqj5p"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; };
   ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.0"; sha256="07nj339k822xnjqcraivl85wcvnq3cp8gz051kq5zmfx19p1wvdv"; depends=[]; };
   ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.7"; sha256="1nammbm9hjsgb46cqvhwx45lfaaxw13d12q43fgwk411a91rblm1"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; };
@@ -3191,11 +3195,10 @@ in with self; {
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
   PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
   PublicationBias = derive2 { name="PublicationBias"; version="1.1.0"; sha256="0prdwv3w9n0ppwizfqqvy5qj7krn3nm2zncz17zh7ijdw87xks4i"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; };
-  Publish = derive2 { name="Publish"; version="2019.11.02"; sha256="1bm6jjqkcbyjhf0n3rjyvgcig6xanf9y38nhnvg121ajnnnwl17m"; depends=[data_table lava multcomp prodlim survival]; };
-  PupilPre = derive2 { name="PupilPre"; version="0.6.0"; sha256="1ngrqrnlm1bpd5krjbxyhvga2mmwqd11dv8djzpgykl4mh41szh9"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; };
+  Publish = derive2 { name="Publish"; version="2019.12.04"; sha256="0vcfz6hx2bkwrksz6b0rx0w6j24h3qswgca06jhgq3jzvsmjjckx"; depends=[data_table lava multcomp prodlim survival]; };
+  PupilPre = derive2 { name="PupilPre"; version="0.6.1"; sha256="02ffcr4ccwx7m81hla0n1vgbhb79y2vvyv1k5928j7kz5p1lv782"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   Pursuit = derive2 { name="Pursuit"; version="1.0.0"; sha256="0wcg9zcln2mpqdyi4k4fcah6s1n0xd0jvc98vl4p1gyygy1x2vdr"; depends=[MASS]; };
-  PwrGSD = derive2 { name="PwrGSD"; version="2.3.1"; sha256="0rzpapjn4nvrqrnjqbfsg9az1mz78q20rv43243sf58nbqw08k6f"; depends=[survival]; };
   PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-7"; sha256="1vrvf68sl2k25y3ppjwpi2j4952aq4k76r92qnq3fj92789ndyqv"; depends=[pack R6]; };
   QAIG = derive2 { name="QAIG"; version="0.1.5"; sha256="1cchf5x7wzc3mc6xzvq14kmd9yxr9kq237s8af4xqaz1pv0b093j"; depends=[Formula stringr]; };
@@ -3211,12 +3214,13 @@ in with self; {
   QDComparison = derive2 { name="QDComparison"; version="3.0"; sha256="0y4494r3ixkyh58xr9md7c6xgcj1hgbjzfybvqqdbawjxvy5p38i"; depends=[]; };
   QFASA = derive2 { name="QFASA"; version="1.0.3"; sha256="1yw745wk9ijvqs3hv0gbm6bkzjrlj42ipwbzypj73s3f7ygl452f"; depends=[boot futile_logger gamlss gamlss_dist Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
-  QGglmm = derive2 { name="QGglmm"; version="0.7.2"; sha256="0w1lqknvap3x1kkhx780sfgps3aqiwhl488lk13zz4yji7fcklx3"; depends=[cubature]; };
+  QGglmm = derive2 { name="QGglmm"; version="0.7.4"; sha256="0ghvicz4ia1180byj28lmg49889hqhb94g1jrkhm6hnzgqbjnfmd"; depends=[cubature]; };
   QHOT = derive2 { name="QHOT"; version="0.1.0"; sha256="02z0n2jawd6m7bvyvpcy0j13p1c0zm036g62n56xva18qnq5c9lb"; depends=[]; };
   QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
   QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
+  QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; };
   QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
   QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; };
@@ -3229,7 +3233,7 @@ in with self; {
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
   QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; };
   QZ = derive2 { name="QZ"; version="0.1-9"; sha256="0i6cgywnfk8klsfr6x35fxzdshfhmps0b1fs5c7199r1rby0b3sc"; depends=[Matrix]; };
-  Qtools = derive2 { name="Qtools"; version="1.4.1"; sha256="0mv0pq4ryaijlz31r7w0qwqw4g8lr1pl9pf2319w2h4p86xp3g8m"; depends=[boot glmx MASS Matrix mice np numDeriv quantreg Rcpp RcppArmadillo]; };
+  Qtools = derive2 { name="Qtools"; version="1.5.1"; sha256="0bcn0r1548vnz59n6vgl66mvjsvq299yf3v2vv58hy4pd171mhzi"; depends=[boot glmx MASS Matrix mice np numDeriv quantreg Rcpp RcppArmadillo]; };
   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]; };
@@ -3241,10 +3245,11 @@ in with self; {
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
-  QuantumOps = derive2 { name="QuantumOps"; version="2.5.3"; sha256="0kcfs3rg50a82spzh5c215c8s2ff0wpdk29yn3n96m3hj4ir7j77"; depends=[]; };
+  QuantumOps = derive2 { name="QuantumOps"; version="3.0.0"; sha256="0kysrfxwnxwll8i2hv0nci8kzmx799vchchkpylqs9ia7j8yn9i6"; depends=[]; };
+  Quartet = derive2 { name="Quartet"; version="1.0.3"; sha256="0rgcgnk636jzqdylax0g40kdpvxpbksds73df6j4jxin7dc6b2nk"; depends=[ape memoise Rcpp Rdpack Ternary TreeSearch]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; };
   R_SamBada = derive2 { name="R.SamBada"; version="0.1.2"; sha256="123a7s3rcmraq4chiqjkdp969jmr4c5br2xamdgvj6gzaf8zpmg0"; depends=[gdsfmt SNPRelate]; };
-  R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; };
+  R_cache = derive2 { name="R.cache"; version="0.14.0"; sha256="1n8n5ihkryrbxv630dwhz4r048nyv676qd3i9f5z5fa04hvlxbqq"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.16.1"; sha256="15zlnq3g27whq26fbcy5zfl5hiddm256h4rga4frblg6wqlbkvdd"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
   R_filesets = derive2 { name="R.filesets"; version="2.13.0"; sha256="124rygq0bl9n4akxcm868nl30cyk3rz0iprb98zlpk62gci9f5fg"; depends=[digest 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]; };
@@ -3253,10 +3258,10 @@ in with self; {
   R_oo = derive2 { name="R.oo"; version="1.23.0"; sha256="189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm"; depends=[R_methodsS3]; };
   R_rsp = derive2 { name="R.rsp"; version="0.43.2"; sha256="128zqyvbq9hm9gy86jzhj609lkfw57vr24mdxgh46ncmx66ag4gj"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
   R_temis = derive2 { name="R.temis"; version="0.1.2"; sha256="1bar4vyjnc9plwqm66vbgf6rakgj095zb7wsypmf3j3az694y62q"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; };
-  R_utils = derive2 { name="R.utils"; version="2.9.0"; sha256="1w4zn2db15bggfnh64fbyi2z2sj47rcd4xn53b28dsnkamdcramj"; depends=[R_methodsS3 R_oo]; };
+  R_utils = derive2 { name="R.utils"; version="2.9.2"; sha256="1krj1ny7y43lpm2q8c7swxfdc3ngy2j8knzv71f8bfsgh673nsxc"; 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=[]; };
-  R2BEAT = derive2 { name="R2BEAT"; version="1.0.0"; sha256="13srg9bkgb3v79bs6ribywbpkkw0idghj87hfwj2k9jmf6d8dz5a"; depends=[]; };
+  R2BEAT = derive2 { name="R2BEAT"; version="1.0.1"; sha256="0x0gb3gpvjmwa6f2p0p45m86l9iy7nwmcjhyi68lg694cvd9ny37"; depends=[]; };
   R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; };
   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]; };
@@ -3282,11 +3287,10 @@ in with self; {
   RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.14"; sha256="1jf1mk6bvi5ybsdrgxvlr0ksnkncn3cpqvz82d28yd9kml2a8q80"; depends=[cluster MASS Matrix optimx pbmcapply Rcpp RcppEigen rgl rrBLUP]; };
   RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
   RAMClustR = derive2 { name="RAMClustR"; version="1.0.9"; sha256="0fw8gps8lyjffrqklfk8ps4fn8ail2m6b54q3805pcw27mb9jxml"; depends=[BiocManager dynamicTreeCut e1071 fastcluster ff gplots httr InterpretMSSpectrum jsonlite pcaMethods preprocessCore RCurl stringi stringr webchem xml2]; };
-  RAMP = derive2 { name="RAMP"; version="2.0.1"; sha256="1n8h58j6v1xs6adrr4w4ha7pn1q2fh14dyg7zgpp2smv0j2b33dr"; depends=[]; };
+  RAMP = derive2 { name="RAMP"; version="2.0.2"; sha256="0836fiycrsxiwdw7srz1rvsf639iqh2rk89gavx4kvn0i0sc8d2x"; 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.6.1"; sha256="10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj"; depends=[]; };
-  RANN_L1 = derive2 { name="RANN.L1"; version="2.5.2"; sha256="1hanh3my84mdr5wy6b89fawqzfc184vff1y65wy4l5ld9qza1n44"; depends=[]; };
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
@@ -3297,10 +3301,11 @@ in with self; {
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; };
   RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
-  RAthena = derive2 { name="RAthena"; version="1.4.1"; sha256="042cbcc0s7sbp8ij7mzrplzs8fs4ac3xw6c064mr6rmig58a2d4r"; depends=[data_table DBI reticulate]; };
+  RAthena = derive2 { name="RAthena"; version="1.7.0"; sha256="0l3pdachqiq42bf715a70849gyi0qvf62mg4m9zfnlaifck14fz8"; depends=[data_table DBI reticulate]; };
   RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; };
   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]; };
+  RBaseX = derive2 { name="RBaseX"; version="0.1.4"; sha256="0wid1vvbj3vlj1l6z5gd7kkjmskmrggj3dmqba4y7nwyvfr0d0hg"; depends=[dplyr magrittr openssl R6 RCurl stringr]; };
   RBesT = derive2 { name="RBesT"; version="1.5-4"; sha256="1050lhwa7ph5xlzchx0lz7fx6bnfl5zhrim9cy2lh4fxw0vdm7xp"; 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]; };
   RBtest = derive2 { name="RBtest"; version="1.0"; sha256="1pyygx39r5dd81xqzqmxhkwapaq7pc5q1bp0gwx28cp4wi07mm6i"; depends=[mice nnet psych]; };
@@ -3316,29 +3321,28 @@ in with self; {
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
   RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; };
   RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; };
-  RClickhouse = derive2 { name="RClickhouse"; version="0.4.0"; sha256="0lb0sgs2f78y2z5ip2wqml88vykrwkdhn3i36y9hyrm34ackis6h"; depends=[DBI dbplyr dplyr Rcpp yaml]; };
-  RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
   RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; };
   RColetum = derive2 { name="RColetum"; version="0.2.1"; sha256="1hgk9p234m3w49sw2j2rg8c14z3gz1mabvb69b1bxrg7f1mz9slg"; depends=[dplyr httr jsonlite]; };
   RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
   RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
-  RCurl = derive2 { name="RCurl"; version="1.95-4.12"; sha256="1x2z708y89fjphhzs76lycs5rmh5i411wallmhyq4h6zmzppjdrr"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.4.3"; sha256="1fywiiqrh6mahhxwx7g05dl1hivwipzylv1h1bpcrs6x75a8nr10"; depends=[curl httr jsonlite lwgeom magrittr sf]; };
+  RCurl = derive2 { name="RCurl"; version="1.98-1.1"; sha256="1zqiawhx5v06vmcg87rmx2qdd9fa4svds3i9a1lphchvprr93jkf"; depends=[bitops]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.4.5"; sha256="1ar3vkslwzqmljq01swdqk72i2q4pcr7x58pi79gaxwx2p1h4bsl"; depends=[curl dplyr httr jsonlite lwgeom magrittr rlang sf]; };
   RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
-  RDS = derive2 { name="RDS"; version="0.9-0"; sha256="1wf7s89s8h4bf8505n1p823myj2nsls2c7r1kbyy78b8h1pvw4nj"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales statnet_common]; };
+  RDS = derive2 { name="RDS"; version="0.9-2"; sha256="01axx9l71j2v57ss9qfhih8jpmy5ayhyjxxvyp4dwxpr5rynfxna"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales statnet_common]; };
   RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
   RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; };
   RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
-  RDieHarder = derive2 { name="RDieHarder"; version="0.2.0"; sha256="0yy17vn7m0042ykrlvlvhd2fbz0hw60nra5zmnc822r2f13h2acg"; depends=[]; };
+  RDieHarder = derive2 { name="RDieHarder"; version="0.2.1"; sha256="1lz5qb51r321wxarnzaf37zxg19fcq8blw2qw3kspgbkvx283l0w"; 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="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="1.8"; sha256="1mvi163djhnq3c711mx4a6mh1vmlcj80562czx12z2gmx13810nh"; depends=[Matrix reliaR]; };
   RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; };
+  REDCapExporter = derive2 { name="REDCapExporter"; version="0.1.0"; sha256="1sqxx6qd7sg76ybpvhk0xzhmlc73bknn3v2cj3s24dyg783ywaqx"; depends=[lubridate RCurl]; };
   REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang 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=[]; };
@@ -3352,26 +3356,26 @@ in with self; {
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
   REddyProc = derive2 { name="REddyProc"; version="1.2"; sha256="1jwmxr9xl45n7r3h6h634lw81j07bn26nhjhwww5nnwwyyylcn4b"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; };
   REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; };
-  REndo = derive2 { name="REndo"; version="2.3.0"; sha256="1xgladcbdhb5shx0wbj470dv6vzi72dpdphrsf8j0p1dz806fp5i"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
   RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; };
   RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
-  RFishBC = derive2 { name="RFishBC"; version="0.2.2"; sha256="19fpvx28zypy7j74iy22dj1c8pwv1rm9jwvmwf1wz85immm4ffh8"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; };
+  RFishBC = derive2 { name="RFishBC"; version="0.2.3"; sha256="1xhjsinb6dfr1zzzyvawc6bb10dnr3nbx86mi6lrzav42sbq31ni"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; };
   RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
+  RFmerge = derive2 { name="RFmerge"; version="0.1-6"; sha256="1pskpfn9wcjq54szcskqakgnv0wwikyadhb1780icivmp10nklnn"; depends=[pbapply randomForest raster sf sp zoo]; };
   RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; };
   RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; };
   RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
   RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; };
   RGBM = derive2 { name="RGBM"; version="1.0-8"; sha256="0xd64g07y808nzs4zvbx6bxdpbj2ndqg6yzc3p0l43pxm4hyxva0"; depends=[doParallel foreach plyr]; };
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
-  RGCxGC = derive2 { name="RGCxGC"; version="1.0.0"; sha256="1qxacxqkxcclkj8f1y7b6c5fspp5qk5847fqb1ib05njh6wxsmvj"; depends=[colorRamps prettydoc ptw Rdpack RNetCDF]; };
+  RGCxGC = derive2 { name="RGCxGC"; version="1.1.0"; sha256="06f1jzs2x9im1vbsj2nfwvda8qchpmza1glgx6v4cn5nnli060fp"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
   RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
-  RGISTools = derive2 { name="RGISTools"; version="0.9.7"; sha256="1bij314qv9lnbb9rjxb37fhp97nz8sqlbqajdbixxpvsnp4mx2k0"; depends=[curl fields gdalUtils httr magick raster Rdpack rjson rvest sp urltools XML xml2]; };
+  RGISTools = derive2 { name="RGISTools"; version="1.0.0"; sha256="10ra22xsqz6y4dcc6vbi8fmbd2k84bhf9icys06z02sizzfm8dl7"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp tmap urltools XML xml2]; };
   RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; };
   RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
@@ -3393,7 +3397,7 @@ in with self; {
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RISCA = derive2 { name="RISCA"; version="0.8"; sha256="0z6wq5bmfx6zrj7cnd7y0x8h7qkz4njcvb8jb1mil92zx2z47d43"; depends=[date MASS mvtnorm nlme relsurv riskRegression statmod survival]; };
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
-  RIdeogram = derive2 { name="RIdeogram"; version="0.2.1"; sha256="1npph7j43fyna3nziy1iqfrl0wh8p0m32r8q3s1cd5ffbr1b7jiw"; depends=[ggplot2 grImport2 rsvg scales tidyr]; };
+  RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
   RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; };
@@ -3401,12 +3405,11 @@ in with self; {
   RInside = derive2 { name="RInside"; version="0.2.15"; sha256="0azhialpdkfm5yzgazq2mfynm8ndyg9d9b569jmg6qa9b2iqf78y"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-17"; sha256="1shcvkgsyjk9jmpf7icj1zjlvmqa11scmymc8cycnffax604frbm"; depends=[abind SparseM survival svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; };
-  RJDemetra = derive2 { name="RJDemetra"; version="0.1.3"; sha256="1j5wxia9j2847rkca3y09lv6b5qs8m3nvvks492kwv1d5vdjlxxv"; depends=[rJava]; };
+  RJDemetra = derive2 { name="RJDemetra"; version="0.1.4"; sha256="0ddps7i7c9hj36jp0567x1fzks981vw45bz16c1dablskw87b0sf"; depends=[rJava]; };
   RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; };
-  RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.3"; sha256="1f92dpaw1mz86mqr16jvmzmjlpzacj9vwq0gafx3bsfnqkd9fpmw"; depends=[]; };
+  RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.4"; sha256="141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l"; 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.2.0"; sha256="19d6k8294g9w3i2d8mivd4p1sczhq9rc26mhz7ywz0x5fxqcpx77"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; };
+  RJafroc = derive2 { name="RJafroc"; version="1.3.1"; sha256="1sa5x9ya2sgddvvrp5x7v12wcm0x1f5v0ja4flpxqqiv4fcsfni3"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; };
   RKEEL = derive2 { name="RKEEL"; version="1.3.1"; sha256="0k13j460jalmjdicrm7rqxb1b25cx1h4c276xbiybmhrmzmjlv5y"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
@@ -3420,12 +3423,12 @@ in with self; {
   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.4"; sha256="08p7pkcwk9nfxvhpbk26mw76x51fqwnqwwh4sxj04sa5q90mwfpw"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
+  RLumModel = derive2 { name="RLumModel"; version="0.2.5"; sha256="1wwia6a3sg9ggy6ggayjiysxn2gwwyv7xd6lhrsfr229jxahsz3g"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
   RLumShiny = derive2 { name="RLumShiny"; version="0.2.2"; sha256="0rwl555564ccw4pdzya88s3h3q30iq5dmi77141ji8ir91x4rz3g"; depends=[data_table DT googleVis knitr Luminescence RCarb readxl rhandsontable rmarkdown shiny shinydashboard shinyjs]; };
   RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; };
   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.6"; sha256="18r9lgfc59x2qrlmybfrkrnb1f2a8xp6dyy2inzw2zn19ps9d3k2"; depends=[chron date vars]; };
+  RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.7"; sha256="10hgssy59fcjbv333grpf6f3m7924hav66xxqhdlsdnwix19q7sb"; depends=[chron date vars]; };
   RMKL = derive2 { name="RMKL"; version="1.0"; sha256="118xdnzljskyf4ibdrlhy07r1y1x5r2b0mqagqaabxs7s9503whc"; depends=[caret e1071 kernlab Rcpp RcppArmadillo]; };
   RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
   RMOA = derive2 { name="RMOA"; version="1.0.1"; sha256="1ppbwqdfxzk1ayms0rqw22l0r8vkk8av39spwpq8avgl6vssw8c4"; depends=[rJava RMOAjars]; };
@@ -3433,16 +3436,15 @@ in with self; {
   RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; };
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
-  RMaCzek = derive2 { name="RMaCzek"; version="1.0.0"; sha256="0pjpsaqm9bfggbd1wagfazgqn23k5ba43a4vv1lmqq44l4fsdgb0"; depends=[GA seriation]; };
-  RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMariaDB = derive2 { name="RMariaDB"; version="1.0.7"; sha256="17l9i2g6rwfkihyvd1ycx7a2m4cfgpwyamsqwd753rc874zszq6m"; depends=[BH bit64 DBI hms plogr Rcpp]; };
+  RMaCzek = derive2 { name="RMaCzek"; version="1.2.0"; sha256="02wkcn079pi5il7n0dqyq89qjn0jxwcdzmm5yr894cn9npmkxgzb"; depends=[GA seriation]; };
+  RMariaDB = derive2 { name="RMariaDB"; version="1.0.8"; sha256="1xcr5lg9da4a49dcqy3hhrpz5jn51dqa6dc50vmkq1nw372yv2iw"; depends=[BH bit64 DBI hms plogr Rcpp]; };
   RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; };
-  RMixtComp = derive2 { name="RMixtComp"; version="4.0.2"; sha256="005fmns31m51p9480bxiahllxpg530j2jxkg2vadw761h61s90al"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities]; };
-  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.1"; sha256="0wbzizrhjazjkn37g72av7h3w2g08530p82casg58m8mzmkcgpfj"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
-  RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.0.0"; sha256="1nyr5llwzqdfv7556ksmx3s17f884wpj19lp36x3zcjx47z98lyw"; depends=[ggplot2 plotly scales]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.17"; sha256="1xamf99ih44dvaxg5x4ivj0hkqssmabgqd7gh8b8q1srw7yg8kbm"; depends=[DBI]; };
+  RMixtComp = derive2 { name="RMixtComp"; version="4.1.0"; sha256="00hygbbzbr5sdbhjzg0k4a7wj88dscmaln6bnxl6ywbzhdh902x4"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; };
+  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.2"; sha256="03dlljykbn2jjnrys2s02vz091f09f92c7h53qxsd2r19l59ymnf"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
+  RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.0"; sha256="0c6sjn6j0g6zc44w5knsgd6ga138gci54yilak8w0xrv5kr7mj3w"; depends=[ggplot2 plotly scales]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.18"; sha256="0r4626sk78fhlgivr0c7mwg9mj29ayr0iz5x90rdl4d5nc2r6kq4"; 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.4.0"; sha256="17gkhmnrxa1zwh6qhc0x48smgyq35g5gdb4wv0m5pnbyhkqzs7sq"; depends=[RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
@@ -3482,8 +3484,7 @@ in with self; {
   ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-2"; sha256="1crmmmxfqcrwp51c74i2s7gdq3rj1imwr8zhwl6xcnjsg24snm3q"; depends=[DEoptim DEoptimR ROI]; };
   ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.3-1"; sha256="1d409hc4cnd1q9d5ldylygis82a4ha1hfbqq36vn7n4xx89wf0k3"; depends=[ECOSolveR Matrix ROI slam]; };
   ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.3-0"; sha256="1a1vag47lfhiqmplrbkp95k36angpi9nvh0jd4cgy5y2416w22hn"; depends=[Rglpk ROI]; };
-  ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-5"; sha256="0xampxba8s9kigxv4xj6nb8a7a02w1aj4ansj99z8m7qg0bg2ivv"; depends=[kernlab ROI slam]; };
-  ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-2"; sha256="0jc6v5xx50gl86ard34k1r32mjqr4hi8ribqm6jkfz68csmzgy6n"; depends=[lpSolveAPI ROI]; };
+  ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-3"; sha256="19iir79dg9vb2dlii9a9j9zn5clawzddypdxdwj3vmqh66yk8n5a"; 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-1"; sha256="02apdbw5b0fknmm798g7nrfs25yjiyqza5b2cd4b6vvj2bjnwpsd"; depends=[ROI xml2 xmlrpc2]; };
   ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-3"; sha256="0ls241xahmd77q2s02mpzr1i10nq5vqgic5j786y9q00f6c3lxyd"; depends=[nloptr ROI]; };
@@ -3492,11 +3493,12 @@ in with self; {
   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-1"; sha256="1n73qm0aw0azwg9m1r3i3qpymzqy7ly8cgsmr00n8pwsgg858h8v"; depends=[ROI scs slam]; };
   ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; };
+  ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; };
   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]; };
-  ROpenCVLite = derive2 { name="ROpenCVLite"; version="0.3.410"; sha256="09mjwv5aq1a0frzmv8lm69kzf9lldql9nqfks95a8vd1z041ndir"; depends=[devtools pkgbuild]; };
+  ROpenCVLite = derive2 { name="ROpenCVLite"; version="0.3.412"; sha256="04nliid0gg0q6yk5w5xk79w28ckkjwi5w0c0k75b8291gb43wj3s"; depends=[pkgbuild]; };
   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]; };
@@ -3506,12 +3508,12 @@ in with self; {
   ROptSpace = derive2 { name="ROptSpace"; version="0.2.1"; sha256="1sc7f2q9856c351nqb6dgq1d34jpahvfxb5l43npa04lm1hh7hqw"; 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.6"; sha256="02pf0j6nrv12jlpyn5fb81hvwllsxx9g88p5cdcvwdldwmjhralb"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; };
+  RPANDA = derive2 { name="RPANDA"; version="1.7"; sha256="0gf25gj9461bl6hi205zvbc17pjw7r8900mirrp5zh08mjzpjmmd"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; };
-  RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0"; sha256="0c5qgfwk2nnkrxhy7y5k197wvi0n1dgnfw5xyccw4a3bw6wa7yd0"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; };
-  RPEIF = derive2 { name="RPEIF"; version="1.0.2"; sha256="1jis52h4x7dxjkwb5dlfswjjk7wz418ra50kxl6aa8dngf79jbma"; depends=[PerformanceAnalytics Rcpp RobStatTM xts zoo]; };
-  RPESE = derive2 { name="RPESE"; version="1.0"; sha256="0cbq3ifwv69ngxh7zvrqjgwqyzd50152k1i95iin6czsn3mz4pjf"; depends=[boot PerformanceAnalytics robustbase RPEGLMEN RPEIF sandwich xts zoo]; };
+  RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; };
+  RPEIF = derive2 { name="RPEIF"; version="1.0.3"; sha256="15v2z6iiai7vhbyhql199dpdb4762lhkqbzm24iraqfffxkbhyb8"; depends=[PerformanceAnalytics Rcpp RobStatTM xts zoo]; };
+  RPESE = derive2 { name="RPESE"; version="1.0.1"; sha256="0hp7nc86gbmnchvhivywh1cg2w6cbvihypdq0mi1r86pxc0n2z61"; depends=[boot PerformanceAnalytics robustbase RPEGLMEN RPEIF sandwich xts zoo]; };
   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]; };
   RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; };
@@ -3520,33 +3522,34 @@ in with self; {
   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]; };
+  RPostgres = derive2 { name="RPostgres"; version="1.2.0"; sha256="16fjwaj1qvr1i9naq19jg2z3dqssi3pp4wwviyqlkj1mmbyh28zx"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
   RPresto = derive2 { name="RPresto"; version="1.3.4"; sha256="17hwq76vzr27prwisfxahs1ix9grldknaywnq3v2a3s2x79v8vbv"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
   RProbSup = derive2 { name="RProbSup"; version="2.1"; sha256="0lmv4x235xiykc8jfnp15l4yypm99yz6spsnaxacp49y2aw23jpy"; depends=[]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.14"; sha256="1jn288796g61sfffnrfm0nm6igyv0yixlb09yhw8fqih7qg14lnx"; 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.2"; sha256="0bky2qy4pvxak8wkly6ldckx2gvirvxw2mfbig3vcgabs9l4g6pq"; depends=[curl jsonlite]; };
+  RPushbullet = derive2 { name="RPushbullet"; version="0.3.3"; sha256="0acydm5xc1j6yjmjipfrg7pvc6h0jwihrg1rx97qwddds2xakkxy"; depends=[curl jsonlite]; };
   RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; };
   RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
   RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; 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.10"; sha256="1x5dzszpx2i4572l55ax5zb308181dsv55mgvmss85w024y20140"; depends=[Rcpp zoo]; };
+  RQuantLib = derive2 { name="RQuantLib"; version="0.4.11"; sha256="0849967lkbcfpy9pnnibdjsv83byn85qrk98bzpxm4wmcd1jqqhk"; depends=[Rcpp zoo]; };
   RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; };
-  RRI = derive2 { name="RRI"; version="1.0"; sha256="163imfrhx435fxw39pi4vj1fmk6g6cldlsgmwcpgfqmp45ycclpj"; depends=[Rcpp RcppArmadillo]; };
+  RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
-  RRPP = derive2 { name="RRPP"; version="0.4.3"; sha256="0h19ysl407fssxhbf364738n1vzkfgr52wv9lz71pss4j8sv3ss6"; depends=[]; };
+  RRPP = derive2 { name="RRPP"; version="0.5.1"; sha256="1znzw0f85jqarg7m303v50kdc6zzx4byrp7nh3nfkhzyxplmc1aa"; 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="2.0.3"; sha256="05n5zxl5w4q2bg4asgk605dsgd360hrpij77rhbyrq0a69nmqw8z"; depends=[ape binr car cluster data_tree doParallel emmeans foreach geiger lmtest mvMORPH nlme outliers penalized phangorn phytools picante plotrix pvclust R_utils RColorBrewer rlist scales smatr tseries vegan]; };
-  RRreg = derive2 { name="RRreg"; version="0.7.0"; sha256="023yfx5mvpzdhns897ibijc7hbr1771c2k6h1yhiy4b7pnaxl0n6"; depends=[doParallel foreach lme4]; };
+  RRphylo = derive2 { name="RRphylo"; version="2.4.0"; sha256="1llrnhwmigcwhb5pr6yr3w91gmqsn5q7xsfk61l03nnslj9vp7aq"; depends=[ape binr car cluster ddpcr doParallel emmeans foreach geiger geomorph lmtest mvMORPH nlme outliers phangorn phytools picante plotrix pvclust R_utils RColorBrewer rlist scales smatr tseries vegan]; };
+  RRreg = derive2 { name="RRreg"; version="0.7.1"; sha256="1mzc9ga5jdh3cf95bxbfy6kdxvqcca74v4hszb63jalzp8w624r9"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.13"; sha256="19xkziixmwwmf7fxkzbsmp9bjii6mznnxyzghbw64kx0kq8bc1ll"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; };
   RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
-  RSCAT = derive2 { name="RSCAT"; version="1.0.0"; sha256="1axc2vks0prd2fz1aaa1bjlfn1plfzdr041wh27v97541vsjdw47"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; };
-  RSDA = derive2 { name="RSDA"; version="3.0"; sha256="1biw9dwzi5sbqnb1jpsggrqrgvfvvna3l5y75hh1iplzixn25p4p"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; };
+  RSCABS = derive2 { name="RSCABS"; version="0.9.4"; sha256="0zknwd07z933c405n14l7mwl4l697g5sfvw19244yv4fs7f6k5cg"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
+  RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; };
+  RSDA = derive2 { name="RSDA"; version="3.0.1"; sha256="1hxzccwjmbj5qnv2z96s9nj8r3fhbixycf4zfkaa5y1dacxz9mk4"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; };
   RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; };
   RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; };
@@ -3555,7 +3558,7 @@ in with self; {
   RSNNS = derive2 { name="RSNNS"; version="0.4-12"; sha256="1fa32wrhv3q0sdgrcrqrazvvylbn83d75bw8d0ncjfspf7dgx3di"; 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.2"; sha256="1inrhap5cs0wry2jbw42fx9wwxb3qdzlpy0ba4f6a29bs8jx9nk6"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
+  RSQLite = derive2 { name="RSQLite"; version="2.2.0"; sha256="1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
   RSSL = derive2 { name="RSSL"; version="0.8"; sha256="0pynj5jppl2bxh0hh6lhqr6s54v0ny4mabk0zrx8xzcbidlwyhn1"; 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]; };
@@ -3567,7 +3570,7 @@ in with self; {
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
   RSelenium = derive2 { name="RSelenium"; version="1.7.5"; sha256="1ih22z3p1p673dhbjsfmli94bzqp5xk3psslf4c0r9dvmw9h6s5c"; 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]; };
+  RSiena = derive2 { name="RSiena"; version="1.2-23"; sha256="04picf0f9rahd37r9fm0cisgaiy2aqshnzfh7cvhcqfaqmpxc8kp"; depends=[lattice MASS Matrix]; };
   RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; };
   RSocrata = derive2 { name="RSocrata"; version="1.7.10-6"; sha256="1pzdpy1mifr6hhhj7pq8l5jl8dsn6270ibm6pnmc66psh0xr2zsa"; depends=[httr jsonlite mime plyr]; };
@@ -3583,16 +3586,16 @@ in with self; {
   RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0.1"; sha256="16sdd0115793yj74i9m64yfxxn3gkk4nvb0qk2w8j7jjbqhflis0"; depends=[downloader dplyr ggplot2]; };
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
   RTD = derive2 { name="RTD"; version="0.1.1"; sha256="1f36wn9f7wjadvll234m97wqfj4adpvif4x0ywn4wfk91cwa5zib"; depends=[httr jsonlite openssl readr urltools]; };
-  RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
+  RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; };
   RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; };
   RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; };
-  RTest = derive2 { name="RTest"; version="1.2.5"; sha256="1pj6gjlrykkjxffq076vq2kwxd3vww85rqswqmddx2ks7jsn3m2x"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; };
+  RTest = derive2 { name="RTest"; version="1.2.6"; sha256="0f7wxscswkg2r6isp0vjfs44dbgqijmh97p053w2mcqi6z1s5cip"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
   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.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; 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-73"; sha256="1zjvvqdcczpnxkm6n3zxv8ysgn5x44k7w2b12yx01h2x71bwg1hg"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-74"; sha256="0m4xynjjl72znnxrpific8haqff33jsimn6ksaf96aims347lpgv"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
   RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; };
   RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; };
@@ -3610,7 +3613,7 @@ in with self; {
   RWsearch = derive2 { name="RWsearch"; version="4.6.2"; sha256="1sak4ihzvba83q1zvn65983qz50cb1nbz1mwiasr3bzz27hhdp4a"; depends=[brew latexpdf networkD3 sig sos XML]; };
   RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
-  RXshrink = derive2 { name="RXshrink"; version="1.1"; sha256="0m8fjcpiv4dp3p9819i3qwfrly5153jpn9v3d2yr674334s1drm5"; depends=[lars]; };
+  RXshrink = derive2 { name="RXshrink"; version="1.3"; sha256="0vripaygn9l71iirvnf84df6dwij2pcfnygw0g5f2ggfiq8snamg"; depends=[lars]; };
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
@@ -3618,22 +3621,22 @@ in with self; {
   RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
   RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
   RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; };
-  RaceID = derive2 { name="RaceID"; version="0.1.6"; sha256="0whj7l9a640fm9kcqr2nyn5c3fidfvsrgiv986w4ziqs2jira7mm"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; };
+  RaceID = derive2 { name="RaceID"; version="0.1.7"; sha256="0rpjcd3vgzd09mfjxc8ji73ncl6d7f5zkv1z1f2nzpz9rhxpd3sp"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; };
   RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
-  RadioGx = derive2 { name="RadioGx"; version="0.0.1"; sha256="0f86q4zjd543q1ia2rbyw0sfc5ljs6y95m7b2knz4xikq0nna4l3"; depends=[Biobase caTools cluster CoreGx KernSmooth magicaxis Matrix PharmacoGx RColorBrewer reshape2 scales]; };
+  RadioGx = derive2 { name="RadioGx"; version="0.0.2"; sha256="1ls56zxsa5l6925ig7d9n3ffns1x0jkbd3zdk530nlffkralwz0k"; depends=[Biobase caTools cluster CoreGx KernSmooth magicaxis Matrix PharmacoGx RColorBrewer reshape2 scales]; };
   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]; };
+  Radviz = derive2 { name="Radviz"; version="0.8.1"; sha256="1kk8xjlcyb52grj0xgjdkpx658678plrx1a3cfaf37xmvspid5j8"; depends=[dplyr ggplot2 rlang]; };
   RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; };
   RainfallErosivityFactor = derive2 { name="RainfallErosivityFactor"; version="0.1.0"; sha256="16yrr2bl62m1nr81nzvmdq7s78f7fg50dah5dg5q4j4j7z8qfsqz"; depends=[]; };
   Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; };
   Rambo = derive2 { name="Rambo"; version="1.1.1"; sha256="036rvjj6gcnf2gg5xl55n5p8j1pzifb9wmlpwnymz1csxgkl477i"; depends=[sna]; };
   RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; };
   RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; };
-  RandVar = derive2 { name="RandVar"; version="1.2.0"; sha256="1ppn14596wmr2lf86rm261736rknvayhzfzgyysmfzd5s23flpki"; depends=[distr distrEx startupmsg]; };
+  RandVar = derive2 { name="RandVar"; version="1.2.1"; sha256="17c6bx644n604zpggmwx1z3krgd9v7c88il45cf5yhp7zf7cc718"; depends=[distr distrEx startupmsg]; };
   RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; };
-  RandomFields = derive2 { name="RandomFields"; version="3.3.6"; sha256="04q20nfgskbjm12ibq4xzhywv9h8hm17ziq72b7d0zxxwnsbzdsi"; depends=[RandomFieldsUtils sp]; };
+  RandomFields = derive2 { name="RandomFields"; version="3.3.7"; sha256="0fnl1450k33vn49x0gc6xljhrrbcb2m7bl9dpn5r8v6yqk2hwjjx"; depends=[RandomFieldsUtils sp]; };
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.5.3"; sha256="0783z23rm5kv0x7796ggx6g07wpf18n7fjzv9r9ryji55sx3r0pa"; depends=[]; };
   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]; };
@@ -3651,20 +3654,20 @@ in with self; {
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
-  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.1"; sha256="1jvy4r3qnyxwa4vai04lsfrf4dgbfg6gpvk4mvzicgdxlnfphrg9"; depends=[RCurl xts]; };
+  RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.2"; sha256="1xra0sn4s8rrjmayg36jg6l3i1cvx9ngh30xyhi18226h0qinx9n"; depends=[RCurl xts]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; };
   Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; };
   Rcan = derive2 { name="Rcan"; version="1.3.80"; sha256="1p9df622sqgmfxargwj63pgpdhqr1bc66y07sr6dv1j038776ysj"; depends=[data_table ggplot2 scales]; };
-  Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
+  Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
   RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
   RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-1.1"; sha256="0nmbb6wfgz164fncljnsr11j2w1hi235hysxn1p2mgc6l301rqhm"; depends=[Formula maxLik msm plm plotrix]; };
-  RclusTool = derive2 { name="RclusTool"; version="0.91"; sha256="14xvfd7g81dw57kjfl8lgq936p9qr0bfm0zmi6fa65ci6di28h8f"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; };
+  RclusTool = derive2 { name="RclusTool"; version="0.91.2"; sha256="07d295fyiv0f19q75cppyqrac7fxlh2yx85nlmarkc6p3072jyrq"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; };
   Rcmdr = derive2 { name="Rcmdr"; version="2.6-1"; sha256="1slwflnz64lbps16jzp2s0cjcns0cpxbh9mb4925l4xg08mc1a27"; depends=[abind car effects lme4 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]; };
+  RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-0"; sha256="08k4x957x08cmhad1r5w502zan13gmcfap16wjfb92b4v3f6dzqy"; 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]; };
@@ -3681,7 +3684,6 @@ in with self; {
   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.11"; sha256="01isc6wswbi39jdgq2wbc3akbjv6fa5x33q1wrmbcc9ph6lvlr4h"; depends=[car 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]; };
@@ -3703,7 +3705,7 @@ in with self; {
   RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; };
   RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; };
   RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
-  RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-0"; sha256="1z13rf5iwmzb7mj3yn4ykkh1r9bl4f4idlc4a34rn4psi9j7wlh1"; depends=[date Rcmdr survival]; };
+  RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-1"; sha256="15hjcp9bmn410mzd7vk47l1163vsjck09gw8smvw1xlhczr4a4y6"; depends=[date Rcmdr survival]; };
   RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; };
   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]; };
@@ -3713,12 +3715,12 @@ in with self; {
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; };
   RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.4"; sha256="1rmadfvavjn17xs0fs93h2dahil5nqg0w59f4zdsnn193cwcfi7p"; depends=[gmp Rcpp RcppThread]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.14"; sha256="1wiigx5g5788j6lyc3f6bs1rsvc4alyc3052g35hxl1giinxmhn4"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.800.1.0"; sha256="1frg7y3fb571jf9dp1kkc75x0nxvw8j3qccsrm1brg5l1z2jmlaz"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.800.3.0"; sha256="0kpcspg3mafi5kncjfhnbcwimvlf19jvrxilvhbpd20sap473mh3"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.6"; sha256="1bkrzdcm18z7qfkcfq5yc4s8z6a43y6cfsa09k6j9ni9bl2pd6hf"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; };
   RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; };
-  RcppClassic = derive2 { name="RcppClassic"; version="0.9.11"; sha256="0aap391fh84342s64v5k43a1vy3cwzg01q3g6ry7mmd2d5h1vv1g"; depends=[Rcpp]; };
+  RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; 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]; };
@@ -3726,7 +3728,7 @@ in with self; {
   RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; };
   RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
-  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.10.3.1"; sha256="1kljhf7y2v0kd7jydpd24grba1zm268ak11hdpg3jxz3s32l45ld"; depends=[Rcpp RcppArmadillo]; };
+  RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.1.1"; sha256="18m2ij98zsp897w9dwr8pjkrmqkjlgsxwiwa939i3cj75sjj3snh"; depends=[Rcpp RcppArmadillo]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
   RcppGSL = derive2 { name="RcppGSL"; version="0.3.7"; sha256="0cnw2k7cfqrm79r6j283aybflxig80x4n4rjkfp2317wf10mrsa5"; depends=[Rcpp]; };
@@ -3743,7 +3745,7 @@ in with self; {
   RcppParallel = derive2 { name="RcppParallel"; version="4.4.4"; sha256="0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia"; depends=[]; };
   RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; };
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; };
-  RcppRedis = derive2 { name="RcppRedis"; version="0.1.9"; sha256="08c2c5d3rn3z89yhlymbr8w145y85hlz1bq3g6kz0kwkjfnkbs1x"; depends=[BH RApiSerialize Rcpp]; };
+  RcppRedis = derive2 { name="RcppRedis"; version="0.1.10"; sha256="07cxp0xdrg1bydlvgryf8jivlqicd880xdfdz6grhqqdxwss8qv1"; 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.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; };
@@ -3757,14 +3759,13 @@ in with self; {
   Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; };
   Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
-  Rcssplot = derive2 { name="Rcssplot"; version="0.3.0"; sha256="1qwrwzyqbwwwjf2zx6712q6wj629vf9rjrgscf0fim10fa6k5grn"; depends=[]; };
-  Rd = derive2 { name="Rd"; version="0.2.0"; sha256="0kf95h4xx8a2s2spld19niwjikaxkys5y5prwq3b7bryfj0s63v0"; depends=[assertthat pkgcond postlogic purrr rlang testthat]; };
+  Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; };
   Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; };
   Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.9"; sha256="029f85visar52002hdpfw5r2zq37kzbr8rgji76nnqi08jk0if4n"; depends=[formatR roxygen2]; };
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
   Rdimtools = derive2 { name="Rdimtools"; version="0.4.2"; sha256="1pklnvg3qrlhskhk2vra38nnqcfdi3fncddm39w9mpxzbzmb62k7"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; };
   Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="0.11-0"; sha256="11cd27s6zp5cxnwxcvz6rjf00y0r7aq8ywhzwpf1r4xy1z44kd4g"; depends=[bibtex gbRd]; };
+  Rdpack = derive2 { name="Rdpack"; version="0.11-1"; sha256="080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq"; depends=[bibtex gbRd]; };
   Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
@@ -3793,7 +3794,6 @@ in with self; {
   Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; };
   Relexon = derive2 { name="Relexon"; version="0.2.1"; sha256="1shq1v3y1jhrnkl3fdnrwv23zrh8dx0k7zwqcvn5dxpd3vzsxqxg"; depends=[readr]; };
   Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
-  ReliabilityTheory = derive2 { name="ReliabilityTheory"; version="0.1.5"; sha256="14k979b9baqnz1gbhbjnp76nvdg5z1sc6p29h3v9qgvwv4aanp4v"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; };
   RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; };
   Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; };
   RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; };
@@ -3810,19 +3810,19 @@ in with self; {
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.9.7"; sha256="0xk55akq0m4ayi839mx8li9saf8irp40xmbrwwg3rwj0zl1wmx1h"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
-  Rfast2 = derive2 { name="Rfast2"; version="0.0.4"; sha256="0n4n8krcznrvksfhkhbdzllfn6j79ca1iks3ckmn4vhipyilcafc"; depends=[Rcpp RcppArmadillo Rfast]; };
-  Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
+  Rfast = derive2 { name="Rfast"; version="1.9.8"; sha256="0y7r3svw4irbyhq42ncpldbf7mkrh9wcx1k0rjg41q04mj3720ch"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast2 = derive2 { name="Rfast2"; version="0.0.5"; sha256="07w0ypwy19cqf4h94pzh0y8fmq5ibr048qzarrs1qzlnk2hx7k4c"; depends=[Rcpp RcppArmadillo Rfast]; };
+  Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; };
   Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; };
   Rfssa = derive2 { name="Rfssa"; version="1.0.0"; sha256="0rmlx1fia0758kbqpi56awh7xws5pwx6zl8nnggi6bqalyskf09n"; depends=[dplyr fda lattice markdown plotly Rcpp RcppArmadillo Rssa shiny]; };
   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]; };
+  Rgbp = derive2 { name="Rgbp"; version="1.1.4"; sha256="1y51sms321sbrl3rgzp5hq4y5mqkrjxsyrq75gkcbwfvlakjcfrg"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
-  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.4"; sha256="0sbklacc4jl5524ixhc11mh6smrzdz4l9pji6cn402i6zdn9z05x"; depends=[png]; };
+  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.1"; sha256="1lrbl0nax7rzk460mh6rq9hydahdi3ckxk4kxx3xij29jl3lmijh"; depends=[png]; };
   Rhpc = derive2 { name="Rhpc"; version="0.19-276"; sha256="1wbdkqmaq3rdj5r9w0mddkcyiabyd9r26jp3i7i4w055mq2r1gs1"; depends=[]; };
-  RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-205"; sha256="1ls2286fvrp1g7p8v4l6axznychh3qndranfpzqz806cm9ml1cdp"; depends=[]; };
+  RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.20-17"; sha256="0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp"; depends=[]; };
   Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
   RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
@@ -3838,7 +3838,7 @@ in with self; {
   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=[]; };
-  RiverLoad = derive2 { name="RiverLoad"; version="1.0.1"; sha256="1cgczg4b7nlvfq46gjlv36j9v45prfga1jf2wr60nd56crc31pzz"; depends=[]; };
+  RiverLoad = derive2 { name="RiverLoad"; version="1.0.2"; sha256="0v689r9k52x8d4pvk6jlsgr6lp22fn3kn7s69hryyy3pmfmlbrh9"; depends=[imputeTS]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
@@ -3862,9 +3862,8 @@ in with self; {
   Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; };
   Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
-  RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; };
   Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; };
-  Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.4"; sha256="0n2nqxn3js3avnln9y5718r73rplr0mcyak70gwhzw4mph2z6i26"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; };
+  Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; };
   Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; };
   RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
   RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; };
@@ -3884,19 +3883,19 @@ in with self; {
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
   Rodam = derive2 { name="Rodam"; version="0.1.6"; sha256="1204zj556xciw29bn2dzndv7dfmmvdhyj5r5slgfzhsxyx0ca4i2"; depends=[RCurl]; };
-  RonFHIR = derive2 { name="RonFHIR"; version="0.3.1"; sha256="06sgjcm45cl1nqdglpqnfdzpiglipg5yq8rr7n3f2qnf4251q3j3"; depends=[httr jsonlite R6 stringr]; };
+  RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; };
   Ropj = derive2 { name="Ropj"; version="0.2-2"; sha256="1jdn4m5xfnm7z7pjchqsy1zhh6kgbi8fw2jl8hw1pckjfyzhlwhw"; depends=[Rcpp]; };
   Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; };
   RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; };
-  RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; };
+  RoughSets = derive2 { name="RoughSets"; version="1.3-7"; sha256="0g6nx0cak6619hxv1fq3b30xv0bdwxb776qkdj6ihig6nhkm2hkj"; depends=[Rcpp]; };
   RoundAndRound = derive2 { name="RoundAndRound"; version="0.0.1"; sha256="1q3xb6y9ip8csivd0qijifxsm3h7zkwz8lxfi4ffdcgrvbl03v8q"; depends=[geometry rgl]; };
   Routliers = derive2 { name="Routliers"; version="0.0.0.3"; sha256="1yrzl3gqh7xkclqdqjwy4yn7qawixpb9mzw31a6wxnrr09hzv989"; depends=[ggplot2 MASS]; };
   Rpdb = derive2 { name="Rpdb"; version="2.3"; sha256="0zy5f7bli6ppc9giwf8845mzjcv54r2sqb8hxwgbn9k6rjlszgi8"; depends=[rgl]; };
   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.11"; sha256="0bqiicdhfv4p6a04b8kvlyg7vmw49br1932fqvr7009jdjf428jp"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
+  Rphylopars = derive2 { name="Rphylopars"; version="0.2.12"; sha256="0a3cpyw7fgfklwzzy77sm3brfdha4p9021jaaa2s2hknpr9c1fmp"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
   Rpipedrive = derive2 { name="Rpipedrive"; version="0.1.1"; sha256="1rf16q0wfmd3n9idiqpmdhcw7sq27yk2cy9gfl5l6bzj0y6ax1q8"; depends=[httr jsonlite]; };
   Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; };
   Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.2"; sha256="0q50f0pp72rwmflxwnridjrcl649kz5h2fm8jfz2pn473mghhya8"; depends=[digest dplyr futile_logger geometry git2r R6 rgl stringr testthat XML]; };
@@ -3927,7 +3926,7 @@ in with self; {
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
   Rtrack = derive2 { name="Rtrack"; version="0.9.3"; sha256="0b73cr299hv2k6ia4ama6ciq9506wy2w2cyh1bv5wdqiyvf8hzia"; depends=[crayon KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; };
   Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; };
-  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.7"; sha256="12hf9r3mhjr9sawdvf7qhjf1zph2q64f77i81jwvy7awidbm0kja"; depends=[]; };
+  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.8"; sha256="0b3f2zkmbyshn19cnaaf042d0zwf43l9jnkqizfhxxwb93a4c1jn"; depends=[]; };
   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=[]; };
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
@@ -3941,10 +3940,10 @@ in with self; {
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; };
   Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.9.1-8"; sha256="01a1f6lwfqpx8jrm1gnmc9mh69zjd53s8s3dmymxyq7lpj62b1qk"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; };
+  RxODE = derive2 { name="RxODE"; version="0.9.1-9"; sha256="09qi26ksqznkmmi5sq6sq0jicn1yc4l25dq4snb6r03vbbbq399c"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; };
-  Ryacas = derive2 { name="Ryacas"; version="1.1.1"; sha256="0gp9ab106c0x9za4laqa08g6cyzpwr2gpbfibk4spr45fldz2969"; depends=[magrittr Rcpp]; };
+  Ryacas = derive2 { name="Ryacas"; version="1.1.2"; sha256="1m5z6x4w461rwk5ay6fc7y3l4b1nwlhma0lis2q8v93adnwgmg7n"; depends=[magrittr Rcpp]; };
   Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
   SACCR = derive2 { name="SACCR"; version="2.3"; sha256="0q5fpzmfj08mzxbxksi5fgkfw8n4zsmh37zqnbwkz30llh620hgv"; depends=[data_tree jsonlite Trading]; };
@@ -3968,7 +3967,7 @@ in with self; {
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
   SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; };
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
-  SASxport = derive2 { name="SASxport"; version="1.6.0"; sha256="1g8sfi61im9i04whybwqq4rl6glisbziqaag1mdfqykxryakjf04"; depends=[Hmisc stringi]; };
+  SASxport = derive2 { name="SASxport"; version="1.6.0.1"; sha256="0cswsp19w41g30hqzpazg20b45xw0gypmr213w7cqp6r7zjrxis6"; depends=[Hmisc stringi]; };
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; };
   SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; };
@@ -3985,15 +3984,16 @@ in with self; {
   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.2.0"; sha256="1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d"; depends=[gplots MASS]; };
-  SCMA = derive2 { name="SCMA"; version="1.3.0"; sha256="0izpbvgimqyj529nzng94p0cvmz9l545b3ra4ycc23rsbg50q315"; depends=[]; };
+  SCMA = derive2 { name="SCMA"; version="1.3.1"; sha256="0j0np99mcr8vgpcg664769gdb3rxm665h4jgj3zplihbh5ihxfj1"; depends=[]; };
   SCOR = derive2 { name="SCOR"; version="1.1.0"; sha256="0r462g3wciz0kkvzwnd7660giy16q8bk8chm73syrw4fnfk2vdkv"; depends=[doParallel foreach iterators]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.4.1"; sha256="00cmlgi5kvi4q8pnq41hbq47243vkycrfplykmkjj9fdnzrlqs8h"; depends=[dplyr dyndimred dynutils ggplot2 MASS Matrix mclust pbapply pheatmap princurve purrr ranger RColorBrewer tidyr TSP]; };
+  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.5"; sha256="01zifl85gw9c3f34yr8llwv6xfdxdrx5z25dfa898hyc100rk9gc"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer 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.3.0"; sha256="0668hjp7m1g7nx4p3ip0z83f1qn83pz0hdkjxxsnl1a8jwgb2748"; depends=[]; };
-  SCVA = derive2 { name="SCVA"; version="1.3.0"; sha256="1s29pcx8rhgsnmha78nylvzr8wbffaczb2wbc15x04vd96xp7513"; depends=[ggExtra ggplot2 plotly scales]; };
+  SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; };
+  SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; };
   SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; };
+  SCtools = derive2 { name="SCtools"; version="0.3.0"; sha256="0iw7ckgfpijnbqicky69la3mpxmd1i5p4rgzznymprra3q1lx35h"; depends=[cvTools dplyr furrr future ggplot2 purrr stringr Synth]; };
   SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; };
   SDAR = derive2 { name="SDAR"; version="0.9-3"; sha256="173qssvca1ds37x3518q3vfl2185b4fnkprvb52pp7mpv1w1xdrp"; depends=[grImport2 linbin readxl]; };
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
@@ -4001,7 +4001,7 @@ in with self; {
   SDLfilter = derive2 { name="SDLfilter"; version="1.2.1"; sha256="1chvg3vh5mwsczbv2ayq9pj1my1i4m2dmr7az1hh00yvlvilfp0y"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra maps raster sp trip]; };
   SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; };
   SDMTools = derive2 { name="SDMTools"; version="1.1-221.2"; sha256="1xvcd97ikqsfdpk2fddy3k0z1ajqga7nv9bgac9c1wnjk1gqrpgh"; depends=[R_utils]; };
-  SDMtune = derive2 { name="SDMtune"; version="0.2.0"; sha256="03bcgmyj3r0bh6ak7bq2skr7mr57qdszpnivjpxr5xisdbws6hkb"; depends=[cli crayon dismo gbm ggplot2 htmltools jsonlite kableExtra maxnet nnet plotROC progress randomForest raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; };
+  SDMtune = derive2 { name="SDMtune"; version="1.0.1"; sha256="0214r8qv3lc74vsrz8sb5bl4c9jbc85vlgl6qgj49w5hw9pqidzx"; depends=[cli crayon dismo gbm ggplot2 htmltools jsonlite kableExtra maxnet nnet plotROC progress randomForest raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; };
   SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; };
   SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
   SDraw = derive2 { name="SDraw"; version="2.1.8"; sha256="05yn0mqdv5a3zyvd6jhmkjh4w06ry8zy0libr56jmp8fcnninvyw"; depends=[deldir rgeos sp spsurvey]; };
@@ -4010,7 +4010,7 @@ in with self; {
   SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-  SEERaBomb = derive2 { name="SEERaBomb"; version="2019.1"; sha256="05ky8gixr19hajssrdvc34dxj4h38wy8ac6mghcfxcxy48vafldf"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; };
+  SEERaBomb = derive2 { name="SEERaBomb"; version="2019.2"; sha256="0rlah68jbaw4qbqq5rnlrm6m9ckz7igbsay6iq1yvk4gy24p9bfh"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
   SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; };
   SEMID = derive2 { name="SEMID"; version="0.3.2"; sha256="0v1zrx5xxramsg2zzk7b2fyv6kky7xb1q1cg8vi6zg6ln9vgm2dk"; depends=[igraph R_methodsS3 R_oo R_utils]; };
@@ -4024,16 +4024,16 @@ in with self; {
   SGCS = derive2 { name="SGCS"; version="2.7"; sha256="12kyfkd2phdmiyflgay2ndl6z5f9gz425mxi48wqs9ar3gh6akdw"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.3"; sha256="055mx876ydg4kzvcm6rxfkxqz849zgzkzsskvrfgwj9fs1k6ja2v"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.9-0.0"; sha256="1nfb9sh10d4wkhzrxyq829b6dhf47pbjp0hzsixamiyjjzhrjz5x"; 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="21.0-0.0"; sha256="0yi5744nd5m255rrysp1a05darg5ac7vrjk3wyfp45cvp45gcjcb"; depends=[crayon data_table]; };
+  SGPdata = derive2 { name="SGPdata"; version="23.0-0.0"; sha256="0801v5fq18bpy6sqsp1g6g7azi5ldl3xqpkrp19gsfbl4kcfbp3m"; depends=[crayon data_table]; };
   SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.2"; sha256="1d0sq27qs6k8rjrjq0g54s76523a3khb873wdy4hinxhcqwqzcaz"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; };
   SHELF = derive2 { name="SHELF"; version="1.6.0"; sha256="1w26vv2r7hd8jpfn6vi4g9z3pav4gy58akvq2vzlcxiaxwv8lvnm"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
-  SHT = derive2 { name="SHT"; version="0.1.1"; sha256="0mwk9vygkpc4jbjlkw0ksxdg3afckylgqmwigjcrvfgdc5is171x"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; };
+  SHT = derive2 { name="SHT"; version="0.1.2"; sha256="0h93yky87rgrydn994j3anq7n2s2vgli47v5ra09gwlv8p1ijpxn"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; };
   SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.1.4"; sha256="1wn69giv6prg9dy10zn2fb63s6a0wqv5maccaf69267anh0s4qpc"; depends=[coda dplyr ellipse ggplot2 hdrcde magrittr mnormt purrr rjags spatstat 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.14"; sha256="0hqpymsy0za2j2ax2md3n81mqjrkyc25s7sl90p3xihvbgf64mcz"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
+  SIDES = derive2 { name="SIDES"; version="1.15"; sha256="1s3qxs7rzff6jr05dz6w13k8ziacbwwvc4bm8rgyjs0bry93zdmb"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SIGN = derive2 { name="SIGN"; version="0.1.0"; sha256="1ak4zv5a50iknrxpfw1iffn8gv8mc0rz2gk96nzky9zx6li5drhk"; depends=[GSVA survcomp survival]; };
   SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; };
   SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; };
@@ -4085,12 +4085,11 @@ in with self; {
   SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; };
   SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; };
   SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
-  SPA3G = derive2 { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
   SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; };
   SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
   SPAS = derive2 { name="SPAS"; version="2020.1.1"; sha256="1bvnyxg3npxv63kikmr30jgc14f1s1a5vfh40qs50nbzq84pl6bx"; depends=[BB MASS Matrix msm numDeriv plyr RcppEigen TMB]; };
   SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
-  SPAtest = derive2 { name="SPAtest"; version="3.0.0"; sha256="0pq8mbj05x4l3lvdgayxigviirhx6ghf4w5bkpvg9hggkb79ib9y"; depends=[]; };
+  SPAtest = derive2 { name="SPAtest"; version="3.0.2"; sha256="0cg8lk0pwzpi5wfcv9843ysnsas94qzh6did7afjjk6z6vv04pks"; depends=[]; };
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
   SPCAvRP = derive2 { name="SPCAvRP"; version="0.4"; sha256="10bvr4lqnim40fihq495a4fy4f33pvfd7gsaqjj9bh6gy0z8y4mi"; depends=[MASS]; };
   SPCDAnalyze = derive2 { name="SPCDAnalyze"; version="0.1.0"; sha256="0zaxlc4dw678s0v22ghv7mc4vqsgkcnmbxh7065w6qj9vm7pg5kz"; depends=[lme4 nlme plyr]; };
@@ -4102,12 +4101,11 @@ in with self; {
   SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; };
   SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-  SPOT = derive2 { name="SPOT"; version="2.0.4"; sha256="1c79p6qkmgkgjqjbdfm9w0pirir6k272bi12ghpdzfpdzq86yjrn"; depends=[DEoptim MASS nloptr plotly randomForest rgenoud rsm]; };
+  SPOT = derive2 { name="SPOT"; version="2.0.5"; sha256="1g3ybbp12hn7wjny2aq3fy3h7c5h7xvmqgsqrmnjb58kqi04vcn7"; depends=[DEoptim ggplot2 MASS nloptr plotly randomForest ranger rgenoud rsm]; };
   SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; };
   SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; };
-  SPUTNIK = derive2 { name="SPUTNIK"; version="1.1.2"; sha256="1g36s5xy5hx39vkg83zq9n3ac0j1ddywf9p4wrwm8ksx8pcln4na"; 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]; };
@@ -4116,21 +4114,21 @@ in with self; {
   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.7.0"; sha256="166sl5vy1nf854wr9ps66h8166l1l8yla5d6c9icivyik77nqqjv"; depends=[RODBC]; };
-  SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
+  SQUAREM = derive2 { name="SQUAREM"; version="2020.1"; sha256="0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
   SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; };
   SSBtools = derive2 { name="SSBtools"; version="0.5.0"; sha256="0z6nzsg8mfmnzzf24w7s7lhkp3xd7vlkgjn34x6yps82ry3mhyra"; depends=[Matrix stringr]; };
   SSDM = derive2 { name="SSDM"; version="0.2.6"; sha256="0qyx755h6rqgc6i3mw0vdaw2jx1yclkm9qxb98njkfk8if7wmbmn"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.5.10"; sha256="0gzx16ra5hx3zjrk3ip6f0yzd9sb9gks1njbx1dg0ag9bc007v4r"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; };
-  SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.5.12"; sha256="12vhdh808w4qbr7ipidx79y0lsn04za7d0m6dxpn8mgbplr64kdb"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; };
+  SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; 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]; };
   SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
   SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; };
   SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; };
-  SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
+  SSsimple = derive2 { name="SSsimple"; version="0.6.6"; sha256="1nhwr9kvlx899wsgzp47ykq3awp7p54zcvsdmjjh9ch4qcm9q2sm"; depends=[mvtnorm]; };
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
   STARTS = derive2 { name="STARTS"; version="1.2-35"; sha256="0xf5dck1zp1m1bxj8j02yyvg0y79i1y4bi3a6q1k41zixk3hcn2s"; depends=[CDM LAM Rcpp RcppArmadillo sirt]; };
@@ -4153,11 +4151,10 @@ in with self; {
   SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; };
-  SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
-  SWIM = derive2 { name="SWIM"; version="0.1.0"; sha256="1mhmffmp0nqq7p6invg4rq4wq984g55fg83ysc9ma8rl584cspyz"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2 spatstat]; };
+  SWIM = derive2 { name="SWIM"; version="0.2.0"; sha256="120rr71hlvwbb3qdwl7s7mhrbjikl11yp55xmddk6xqs13qvi5j0"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
   SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.2"; sha256="0123lcb6jfh3gbh2jmdpargry44fncm7j505vpkcp661fcjckymd"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; };
-  SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; };
+  SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
   SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
   SailoR = derive2 { name="SailoR"; version="1.0"; sha256="1gb50qd9s3dwdvl6qihpkgwlhckbhn7h3wpz9k74xgyd874krcld"; depends=[]; };
@@ -4172,7 +4169,6 @@ in with self; {
   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]; };
   Scalelink = derive2 { name="Scalelink"; version="1.0"; sha256="0likfjw5999zd0kv1ykby78bl0x3xgh0v1yjssk7fnw1ghkxgdib"; depends=[Rcpp RcppParallel]; };
-  SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; };
   SciViews = derive2 { name="SciViews"; version="0.9-13.1"; sha256="0wm4vnjh65jxyg82m8l08kanl414qiaz0cc6srshb8sdx2sixkfi"; depends=[ellipse]; };
   ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
   ScorePlus = derive2 { name="ScorePlus"; version="0.1"; sha256="07hmrx1k256i4cs605j5bpg6brzypryxlcnjkzqak8cw4f26k24q"; depends=[combinat igraph igraphdata limSolve RSpectra]; };
@@ -4204,7 +4200,6 @@ in with self; {
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; 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=[]; };
   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=[]; };
@@ -4215,25 +4210,26 @@ in with self; {
   SeqFeatR = derive2 { name="SeqFeatR"; version="0.3.1"; sha256="1dvl65n60j7wl0jdb0myi9hprlr9grq6nf9m68gzxm9sz3h8lpvh"; 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]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
-  SeqNet = derive2 { name="SeqNet"; version="1.0.0"; sha256="0933g3sydz04yxf98ww0szwk85hlp7z839da9f6w13761aai1r3k"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; };
+  SeqNet = derive2 { name="SeqNet"; version="1.1.0"; sha256="0dbiafqgqnmws38lpa58mkzciprkan5qnrw9aivi89s065ykjd74"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; };
+  SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; };
   Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
   SetMethods = derive2 { name="SetMethods"; version="2.4"; sha256="06fcin03mvqbg4mk09ygn54li0wdyp57mv902c49zs9v4y8r88cs"; depends=[betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
-  Seurat = derive2 { name="Seurat"; version="3.1.1"; sha256="084lr2fjdksshsmv1ww82bgn3a9mml7kswsidjrs89snabgvn360"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne uwot]; };
+  Seurat = derive2 { name="Seurat"; version="3.1.2"; sha256="0m1qi39snbmkkv1p07bzg1r7snc9x6a1y0dghvpk1nzgcfpmnsj4"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne uwot]; };
   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.2.0"; sha256="1gw8wwdqbra4bccbcamqn2j7d853rga1vcvk1p6naih6vbnfqn2s"; depends=[matrixcalc sadists]; };
-  ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.0"; sha256="1i77f2pc4a8x2w1x9p56m1jv317pmlidp2pmk7s2xynwwviqylmb"; depends=[Formula]; };
+  ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
   ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.1"; sha256="1s1kb1rrppk0kfqywgsmyfl32hrq9ywv8241n9d3xv88cflxz237"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM 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.4"; sha256="05ia1x8hmaa8df77jbs4nd04jfbglr5z6hfg9v702zhvap0mkijj"; depends=[ggplot2 lavaan stringr tidyr]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; };
   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]; };
+  SiMRiv = derive2 { name="SiMRiv"; version="1.0.4"; sha256="1sdq1mdm5jm66jmq7mas9skq8014xd7iz16av64x645l4qxkawzw"; depends=[mco raster rgdal sp]; };
   SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; };
   SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; };
   SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
@@ -4246,19 +4242,18 @@ in with self; {
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; 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.14"; sha256="0im53w0hjm7qdi4xlp8mccnjx43k819wics8gmfqqxljwna0mmmm"; depends=[foreach pbapply plyr]; };
+  SimDesign = derive2 { name="SimDesign"; version="2.0.1"; sha256="00f4dk82zqz5gns3cmnzc009hij8sv591wd77cz6zkssh93mk3j8"; depends=[dplyr foreach pbapply plyr]; };
   SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; };
   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.4.0"; sha256="0nq20amk41xs4dpxxrllrxnnb8wqf5sshbvgdlm93y7dhamlv8x3"; depends=[Matrix]; };
-  SimJoint = derive2 { name="SimJoint"; version="0.2.2"; sha256="1b88iv64hhil96cyfc3925askf7vfkr609x1qwwcw6pqi8bw1q4y"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  SimJoint = derive2 { name="SimJoint"; version="0.3.5"; sha256="117jv2wzi3aqbim9w30k1cvwjnzb23kh6z0p78hm4bz37wm5vdw3"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
   SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
   SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.3.0"; sha256="1ppms2cirdhm8lsfl74mfc1f9zwc7lin6r5xs649czqlj63yzk4i"; depends=[dplyr kinship2]; };
-  SimRVSequences = derive2 { name="SimRVSequences"; version="0.2.0"; sha256="01rxbncywbqmx4sww67f772lpd6ws0hjcqv3mhnpkiqbsmhrqy64"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; };
+  SimRVSequences = derive2 { name="SimRVSequences"; version="0.2.3"; sha256="188sd1xyi2iaw5ra23wa2ilz5zi7vl6vjcswfcpn49r2yw5i9w4n"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; };
   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=[]; };
   SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; };
   SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; };
@@ -4284,7 +4279,7 @@ in with self; {
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; };
   SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; };
   SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.4.0"; sha256="0rx47hvm4wkmrj1hrwaa8j61y3agfb09n048j9xlda5rismaqk8z"; depends=[Matrix SSBtools]; };
-  SmartEDA = derive2 { name="SmartEDA"; version="0.3.2"; sha256="153bh9igdiq93ydibmfj9xklc5qj66zsakgkynk0apnczzzipn3y"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; };
+  SmartEDA = derive2 { name="SmartEDA"; version="0.3.3"; sha256="0harv4ybs5qy7qcj9disissw2kj46q54pkra50ysjfs1li1dw860"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; };
   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]; };
@@ -4292,7 +4287,6 @@ in with self; {
   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="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; };
-  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.6.0"; sha256="0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
@@ -4321,7 +4315,7 @@ in with self; {
   SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; };
   SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.7"; sha256="0m2yn907p884xq6da75ji87r5p3zzygkwxa50isz8lgnp31xmgpy"; depends=[backports codetools crayon data_table DiagrammeR dplyr fastdigest fpCompare future httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi whisker]; };
-  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.3"; sha256="0rly10mfk8r2c6a7p8372aagsiv2dk9s2apqvdvcj7frcac3jz3y"; depends=[backports bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; };
+  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.4"; sha256="0iz6mnppp2p036b7z0rcv0hbcb3m1s4262ws797qpgxqj22d0hpy"; depends=[backports bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
   SparkR = derive2 { name="SparkR"; version="2.4.4"; sha256="181qys7whk061bk8gl8ah34g4wk3a0lw40dnx18nj8yf5iq6yvzd"; depends=[]; };
@@ -4330,20 +4324,20 @@ in with self; {
   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=[]; };
   SparseLPM = derive2 { name="SparseLPM"; version="1.0"; sha256="1mpjf7yk2haa8hch315davb6nrhxhy0w2vgw2x4111rn4bskhd8m"; depends=[gtools Rcpp RcppArmadillo vegan]; };
-  SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; };
+  SparseM = derive2 { name="SparseM"; version="1.78"; sha256="0cmlm0lps3daalvp5jzjnjfys388hgkyc8yw0g5r2351h749xdyn"; depends=[]; };
   SparseMDC = derive2 { name="SparseMDC"; version="0.99.5"; sha256="0d3ashk3l9fjdbiyjhaxc05ayyscissrg7lwhnh46hv3fydbixlj"; depends=[doParallel doRNG foreach]; };
-  SparseMSE = derive2 { name="SparseMSE"; version="2.0.0"; sha256="0i58lq4kqb9gdhd1r3v7czjaz76y9gyf0avf37m9z12sw8kwmdac"; depends=[lpSolve Rcapture]; };
+  SparseMSE = derive2 { name="SparseMSE"; version="2.0.1"; sha256="1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7"; depends=[lpSolve Rcapture]; };
   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]; };
-  SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.1"; sha256="0vqajxcjjdp9dv53w0s4d1z63yrnzvs90h7cqs0f6daaihyvm130"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-3"; sha256="0nx3x4jiiwwa2983lbszpm22xgc41gcdcm967h1p9a4xz2a6wgcs"; depends=[]; };
   SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
-  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-7.2"; sha256="0aqq9ryxi4xsdqjhc1lhb7ai8szs7m2vys6nn0ygps1w3pm4xwj8"; depends=[fields maps]; };
   SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; };
   SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; };
+  SpatialKDE = derive2 { name="SpatialKDE"; version="0.5.0"; sha256="15v8msvmpy72d0vjrra1rmkkxn7pm11bngr3liw2n43lwkh19l9i"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; };
   SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; };
@@ -4352,19 +4346,19 @@ in with self; {
   SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; };
   SpatialVx = derive2 { name="SpatialVx"; version="0.6-5"; sha256="1n2d686aa6y8dy1y78i6ncl9abiafj96prfgkgcv8w8jmg0d23z5"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9.1"; sha256="1i9w1gb4klwfwas934lw0a01pyp87y7ydrlk05xgd52i4j1y9wcn"; depends=[MASS Matrix]; };
-  Spbsampling = derive2 { name="Spbsampling"; version="1.3.0"; sha256="1jy3dbadn4aa4h7s020ydgs9pksf7h3p2q9laxaqm1ygia71n6l0"; depends=[Rcpp RcppArmadillo]; };
+  Spbsampling = derive2 { name="Spbsampling"; version="1.3.1"; sha256="0k3c1db19ngqlaxc2842gfls5936hb0vb6x0za3f3hcdpd7b5mlc"; depends=[Rcpp RcppArmadillo]; };
   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]; };
-  Spectrum = derive2 { name="Spectrum"; version="0.9"; sha256="1n7jw8l1jidrsma5sdv7sdb1g29i0ianyrzclrxx49i0md2wnx5g"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; };
+  Spectrum = derive2 { name="Spectrum"; version="1.0"; sha256="0ayvzkbbklzvnz3vd6xknsgjw9avp7k0bd4hqz0rkmdfl30jjash"; depends=[ClusterR diptest ggplot2 Rfast]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
-  SplitReg = derive2 { name="SplitReg"; version="1.0.0"; sha256="09ni4hqyr3ng1yvb2g4wyl8vm1sa05rv649g0c9bfq6m6cx7xdvy"; depends=[Rcpp RcppArmadillo]; };
+  SplitReg = derive2 { name="SplitReg"; version="1.0.1"; sha256="0gifj5jk88xyda7sb7l0wbpx86gcj7d4yx2mfljlm882yr0ic7aa"; depends=[Rcpp RcppArmadillo]; };
   SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-0"; sha256="0nlli8nap6ilb5ns1xavyb06nhj2dlf4p0gajmsgrz32s2ljhr8s"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-  SqlRender = derive2 { name="SqlRender"; version="1.6.2"; sha256="1b2wkzy10m4zn1yjny1h8kx5k6vfl78vw82fq8a7ksxm113vjxs7"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.6.3"; sha256="08w40d3cnnqdw11i4ycr11m3xn2a5gg7blqgmdn336dlhqsc9mdc"; 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]; };
@@ -4374,9 +4368,10 @@ 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.19.0"; sha256="14j5w4pnk45b3wbjclrsq7q1pxdrz264wvhz94vkm43sdacqzax0"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-1"; sha256="0gqdp5galy3fgrx9c7ks5hlcla76idfp4awc40xj03wnya51952f"; depends=[RcppEigen]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; };
+  StatCharrms = derive2 { name="StatCharrms"; version="0.90.94"; sha256="16056gd3wx5qcm9bnrl8hk8dk85j9ikan2dz4acpsfhpga80vp0n"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
   StatDA = derive2 { name="StatDA"; version="1.7"; sha256="1hsy4aivd5ga2zj65hr2c5cn9qgjnhs123qqyg6q959vsjxzp0i0"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.3.0"; sha256="1ms8qmxgpfa9sk7kl6hpcal14xxn7i84h662va2n045w7p0qmcjw"; depends=[clue lpSolve proxy RANN survey]; };
@@ -4387,7 +4382,7 @@ in with self; {
   SteinerNet = derive2 { name="SteinerNet"; version="3.0.1"; sha256="1jkvv0hsj85i1zfr1bmdsrbwgl11mxpfci3z7997m5vvb5fb5cxn"; depends=[igraph]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
   StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; };
-  StepReg = derive2 { name="StepReg"; version="1.3.3"; sha256="1l2m65dlq59dh8jx1czc17j44pgqihcx37bfdp6x61nvdhf5sw40"; depends=[Rcpp RcppEigen]; };
+  StepReg = derive2 { name="StepReg"; version="1.3.4"; sha256="1fqvz9b2mh1i8zlqnpxfqygydh15y145wszdcvijcbgn5albkl7x"; 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.3"; sha256="0sr8i6hq9iir2f717yvm5kdda047hamsqcrl553jjzzcbxg0y5m1"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; };
@@ -4397,9 +4392,9 @@ in with self; {
   StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; };
   Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; };
   StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; };
-  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.0"; sha256="1fxw0ih68ny04342gymihl2zir34rflq9kpvg72czfpp2j8aqhy3"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; };
+  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.1"; sha256="0g7r6jz9gqy66784sygg20l0gyikqmkm69hssyqdsvhgslwmdq5r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; };
   StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; };
-  StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.6"; sha256="1383gnxfsczvpazkhdq0fpv0x41jq47ksxam29yq19m2gh4afswc"; depends=[diagram dplyr GGally ggplot2 shiny stringr XML]; };
+  StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.7"; sha256="0650qrip02r079zqfaii9097p2d8dm90356v0f3gialg140rsbys"; depends=[diagram dplyr shiny stringr XML]; };
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
   StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; };
   String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; };
@@ -4409,31 +4404,32 @@ in with self; {
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubTite = derive2 { name="SubTite"; version="3.0.0"; sha256="1kv5083zfxla4v1y7zhkd2rhld8mhmnilkz78q26qp121qqbf93r"; 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]; };
+  SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.2"; sha256="1hiaa4zwk3ll6ans1v7r76pmzbq7j8mhw72s30j7mhgkkkqpnr12"; depends=[alluvial circlize colorspace diagram dplyr geoR ggplot2 ggrepel 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]; };
   SummaryLasso = derive2 { name="SummaryLasso"; version="1.2.1"; sha256="1gb1g1xgda5psq93vy50yfr0cbhvymliblpkxz7ck1nwpp65n9py"; depends=[gtools]; };
   Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; };
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
+  SunsetTSA = derive2 { name="SunsetTSA"; version="1.0.0"; sha256="1akp84dqihw03b7jga4i8psclss10xsv96ysav1ff9kg81apav8n"; depends=[httr]; };
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
-  SupMZ = derive2 { name="SupMZ"; version="0.1.0"; sha256="0qzsx6czp72bamzs0lgpp8ypqfzb1c51xqfag8xx1nnnlcl1hv25"; depends=[dplyr magrittr]; };
+  SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; };
   SuperGauss = derive2 { name="SuperGauss"; version="1.0.1"; sha256="0pkk8aaghkrh87g6ahikngp6hahaxwhr8i9vz30vv2bzxpgba54b"; depends=[fftw Rcpp RcppEigen]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-25"; sha256="0m17bw343612bzz85dz76skbda5wkv1c7pif8ldfsffx8inaxhy8"; depends=[cvAUC nnls]; };
+  SuperLearner = derive2 { name="SuperLearner"; version="2.0-26"; sha256="10b0fh71ky92mp0ydi81s6zm3sn47k5agppcg4zpgqmailn94qj4"; depends=[cvAUC nnls]; };
   SuperPCA = derive2 { name="SuperPCA"; version="0.2.0"; sha256="1g2qf2y83clmjx327b9yk6bkx4l7rm0hj0sjvia2fll24m4hxcjz"; 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]; };
   SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.1"; sha256="15d611ik6qg0602n6yk34a1pgfciv42nzd8qaarmxnqqrn8i584n"; depends=[ClusterR OpenImageR R6 Rcpp RcppArmadillo]; };
-  SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
+  SuppDists = derive2 { name="SuppDists"; version="1.1-9.5"; sha256="1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8"; depends=[]; };
   SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; };
-  Surrogate = derive2 { name="Surrogate"; version="1.4"; sha256="184c34ks6q8qdv7kgl3z7p71a8qbfkazg60wglk2q7f1aqfaahgb"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="1.5"; sha256="104k7fgbl7aqgapm6qrkx0vhlfvbwl5gqdllrrks74ws7hbmmfgd"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
   SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.1"; sha256="0m6m44vsfdgv47sswi2s8snmypa7s2ppad73fqnvymq8fm2b3yl2"; depends=[survival]; };
   SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 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=[]; };
+  SurvLong = derive2 { name="SurvLong"; version="1.1"; sha256="1lkbz5wa6ggwvg2aq13bc4hm6lqsj3wal5c33kamnrg9pk2cssj8"; depends=[]; };
   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]; };
@@ -4450,7 +4446,7 @@ in with self; {
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   SynthTools = derive2 { name="SynthTools"; version="1.0.0"; sha256="0izsp1gcch3bb7ssq3w5na5k0nli18mcqkx757icnb32jpy9m3a8"; depends=[dplyr magrittr Rdpack]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAG = derive2 { name="TAG"; version="0.1.0"; sha256="1ha29kxd767g47qi93sb0p3mwdzvbf1hwa0s2lq3c938hfa3pg6v"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; };
+  TAG = derive2 { name="TAG"; version="0.2.0"; sha256="0s4n2f9x36df1pb5p8n98926lgg9z79fka5r9xqxxsc91h35q9aw"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; };
   TAM = derive2 { name="TAM"; version="3.3-10"; sha256="1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq"; depends=[CDM Rcpp RcppArmadillo]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.3"; sha256="151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p"; depends=[glmnet Matrix]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
@@ -4461,11 +4457,11 @@ in with self; {
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCA = derive2 { name="TCA"; version="1.1.0"; sha256="0pj052kd378x1gmg5wcbk8c0dca3c2ra65hnagljmsplv169vimy"; depends=[config data_table futile_logger glmnet gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
-  TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
+  TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; };
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; };
   TDA = derive2 { name="TDA"; version="1.6.9"; sha256="023jwhh1qc2y30g42pgfaha4n4pixzwrrghxlyss4889fr66q9vw"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
-  TDAstats = derive2 { name="TDAstats"; version="0.4.0"; sha256="091fx0qla7jr5h7a84rp5mdsrafzdk87gk5xdflf62dk7qghb9kr"; depends=[ggplot2 Rcpp]; };
+  TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; 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.1"; sha256="10lx1yksz61byjcwqi9v59pqka0fs5dhrq4qjmp0i2zvn6cgh1zj"; depends=[adabag SPOT testit twiddler]; };
@@ -4473,7 +4469,6 @@ in with self; {
   TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; };
   TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; };
   TEAM = derive2 { name="TEAM"; version="0.1.0"; sha256="1yj7fw935rr7fh7h2p4ra8d3ynz5c6b30fqzm1djgav1k84wcin2"; depends=[ggplot2 ks plyr]; };
-  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]; };
   TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; };
@@ -4486,13 +4481,13 @@ in with self; {
   TGS = derive2 { name="TGS"; version="1.0.0"; sha256="0x3a8c02zibqh57sr79gk792m6dsxgzmqpk73lflvg1l2s3r6zf8"; depends=[bnstruct doParallel foreach ggm minet rjson]; };
   TH_data = derive2 { name="TH.data"; version="1.0-10"; sha256="0mgz7aj2d9abbmdr65zgmg1ddp3fdbs3mfj83r5xadh5ldkir2k1"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.2"; sha256="1y1bc6wsd32792apsc6qncxbw5y8ww9xlhy9v49mhwbffgzn6llg"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
-  TITAN2 = derive2 { name="TITAN2"; version="2.3"; sha256="089v4rphxa2wz1w4akqrx7xnzgagirp8z1d38m2v9z9n9dlhj4id"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; };
+  TITAN2 = derive2 { name="TITAN2"; version="2.4"; sha256="1ai4mr69iwl8lliy1zak73s3a4skny4w09clh4z1ri7r5fmq1c2q"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; };
   TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; 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.4.4"; sha256="0frq3zpg08rpmkf4fshq9igc6irzn7br3rkbn4sxxf8kkp1c9m9l"; depends=[ggplot2 hypergeo Rcpp]; };
+  TLMoments = derive2 { name="TLMoments"; version="0.7.5"; sha256="0v86rs7f63f59ng9m6lnjgv52czg1xk814flnhz153fjy7y2pidl"; depends=[ggplot2 hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.15"; sha256="1r2d8c5iazihba42sn33yarv0dcfiy989sx64zcf14zr8k6cgjzs"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.16"; sha256="0lly12hdi99iklwr0vg9xkyhi038w4gncbf895qcwbndmqp0lx44"; 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]; };
@@ -4509,7 +4504,6 @@ in with self; {
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; };
   TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; };
   TRES = derive2 { name="TRES"; version="1.1.0"; sha256="0brj8wszgf9fkqfa3v0qg5wg9wi1b8k2ddixv3p29cdb57gsacdw"; depends=[ManifoldOptim MASS pracma rTensor]; };
-  TROM = derive2 { name="TROM"; version="1.3"; sha256="1glbpbq8qhlxhcscgsqivmncsmadfhlsin47r9jxxd2s087cdh2f"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
   TRSbook = derive2 { name="TRSbook"; version="1.0.2"; sha256="0lj20i6gybinc196nzjfi6ayzmm970s9vp43lj60v96g5dl7qv1b"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   TSA = derive2 { name="TSA"; version="1.2"; sha256="0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q"; depends=[leaps locfit mgcv]; };
   TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; };
@@ -4518,7 +4512,7 @@ in with self; {
   TSE = derive2 { name="TSE"; version="0.1.0"; sha256="0fzdlryb8m9h6q8w0q42wpphmvm439zxk1imqzmskm48r7w6nm7w"; depends=[]; };
   TSEind = derive2 { name="TSEind"; version="0.1.0"; sha256="0xv968a12p9riq5nk82gq1ixglb2077c99i2a5ws6s23xzs1s29h"; depends=[]; };
   TSEntropies = derive2 { name="TSEntropies"; version="0.9"; sha256="1bwb3kyhzc6sxhvpagf4vjmh8ghx44lpc9ms4jwrsrzdhcvnfc7l"; depends=[]; };
-  TSEtools = derive2 { name="TSEtools"; version="0.1.3"; sha256="1n5dklsqsz6w31rhszrq0rrxc9mingz4haxmnjzanacvvmzsj36j"; depends=[quantmod xts]; };
+  TSEtools = derive2 { name="TSEtools"; version="0.1.4"; sha256="1dfamkpiczw9zgyhjzx8vwd5hvadxbf3i0sf9xcx9fbr6d9hb3gz"; depends=[quantmod xts]; };
   TSEwgt = derive2 { name="TSEwgt"; version="0.1.0"; sha256="0j14vja4r4qvw4f94461adi1g4igx9c0az20z6bkbkkhp79xi62l"; depends=[]; };
   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]; };
@@ -4551,17 +4545,18 @@ in with self; {
   TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsmoothing = derive2 { name="TSsmoothing"; version="0.1.0"; sha256="1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl"; depends=[ggplot2 gridExtra MASS Matrix]; };
   TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; };
-  TSstudio = derive2 { name="TSstudio"; version="0.1.5"; sha256="0xyvh5brfqmkhv1d65m1i5hy4b9pg08ax0nw3nbfc1qqnp4zg1jb"; depends=[bsts data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr tsibble viridis xts zoo]; };
+  TSstudio = derive2 { name="TSstudio"; version="0.1.6"; sha256="1r45s4xgc9a2rdh225xzmwr7g6qahmjj7v1a6g7haghnhaq6hv4s"; depends=[data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr tsibble viridis xts zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.5"; sha256="1l2sc4mphk440jxc9sgryqcqr9kwh00fdizswrsria25fbg0nzl4"; 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-5"; sha256="0fxipnyxaz55n4camrk9cs71x9w4dsmjrihysv8i1s6khf825rg6"; depends=[curl xts zoo]; };
+  TTR = derive2 { name="TTR"; version="0.23-6"; sha256="0rg22ma3x07s9djlxscfw5jcq1gbir05cwhgvwfi53x1sf4hmhdg"; 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]; };
   TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; };
   TUWmodel = derive2 { name="TUWmodel"; version="1.0-2"; sha256="1b07isi7s22q65h9yabrz515nr4vxp2ynpl37l2lsf4mcpjjzg4x"; depends=[]; };
   TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; };
+  Taba = derive2 { name="Taba"; version="0.1.0"; sha256="0pqmz7gyf719s5b7mjmmmxr5il3pzgsymibxir6ljpgdsdgbgi5s"; depends=[robustbase]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
-  TableHC = derive2 { name="TableHC"; version="0.1.1"; sha256="16iv93ia0whx1wgq817zd1nrxfwm4d6dkw28q22vdpbppr35ccaz"; depends=[]; };
+  TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; };
   TableMonster = derive2 { name="TableMonster"; version="1.7"; sha256="1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb"; depends=[xtable]; };
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.2"; sha256="034vca0il7006zdkh5vdfjddyq9lg5mkl8hjria2rpks6wx0jhrd"; depends=[]; };
   TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; depends=[Biobase oompaBase oompaData]; };
@@ -4569,10 +4564,11 @@ in with self; {
   TangPoemR = derive2 { name="TangPoemR"; version="0.1.0"; sha256="06w5gg36mx0vdagkhy7rskgjv2d3irr0d3nkjw26vxp25x1py4sf"; depends=[jiebaR]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
+  TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; };
   Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; };
   TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; };
   TauStar = derive2 { name="TauStar"; version="1.1.4"; sha256="06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1"; depends=[Rcpp RcppArmadillo]; };
-  TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.0"; sha256="0mkw7d2pksj98kyg2951achmvsr0x7f4snq0kk1s5158b5yi5npn"; depends=[]; };
+  TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.1"; sha256="0izjf6vrdjvs9axvafr2mamr157i8w6d7m5sfjch1p5c174cpr9c"; depends=[]; };
   Taxonstand = derive2 { name="Taxonstand"; version="2.2"; sha256="1cpx5mp17l9gjvb60f0ypm8r8b69ff520p67jac8y6rvw8aqhc6j"; depends=[pbapply]; };
   TcGSA = derive2 { name="TcGSA"; version="0.12.4"; sha256="1kqgmmrkwy5idr77r3grq76km6bvi2003a148kjmdmi688jjkc2g"; depends=[cluster cowplot ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
   Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; };
@@ -4580,16 +4576,16 @@ in with self; {
   TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
-  TeachingSampling = derive2 { name="TeachingSampling"; version="3.6.0"; sha256="14afxdvcprnsp34zgmfz8c3kfac35bkm2lq73ga84xcklsiq3gaf"; depends=[]; };
+  TeachingSampling = derive2 { name="TeachingSampling"; version="4.0.1"; sha256="1hh56j1l8wyglnmy92cvh0awcyfjzk6iwgwnhdbc2infjq8fr1lg"; depends=[dplyr magrittr]; };
   Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; };
   TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; };
   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.1.2"; sha256="0zbvgvs81ciz6qwxmmniylz5b4ci9r9zsa86b4fr36by27mafs6w"; depends=[viridisLite]; };
-  TestCor = derive2 { name="TestCor"; version="0.0.1.0"; sha256="0jqx74khjw8d3gvw5kn3yqfps877043d9wa6ffb33b5x7nfnj4hj"; depends=[MASS Rcpp]; };
+  Ternary = derive2 { name="Ternary"; version="1.1.3"; sha256="1hpm6ybksyizzkpig88jczj58kzgc82dmm22wy61hqhlbs4pmj1z"; depends=[viridisLite]; };
+  TestCor = derive2 { name="TestCor"; version="0.0.1.1"; sha256="1rxw5rz687ax3zlpaxb9bak6dd2jdl49h3fdzbz7r8vycwanwydq"; depends=[MASS Rcpp]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; };
   TestDesign = derive2 { name="TestDesign"; version="1.0.0"; sha256="0jl65fv5iafpnm3xbi1wf676qdyk329cqm6c9zw9gzzbwc7f2pb7"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; };
-  TestDimorph = derive2 { name="TestDimorph"; version="0.2.1"; sha256="1g98f19mxr4snjzbmxscx5lqcqkf3zgg4vgrcfly9pwf0qdn7ard"; depends=[caret corrplot dplyr klaR MASS mda plyr purrr reshape2 Rfast rlang rowr stringr truncnorm]; };
+  TestDimorph = derive2 { name="TestDimorph"; version="0.2.9"; sha256="0f2np7rqlcqxj2x1lwx6fryvdizan21j9962i51yi9b6pvkbpn6h"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
   TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; };
@@ -4602,8 +4598,8 @@ in with self; {
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; 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="1.1.2"; sha256="0d7facbb76pml9yamcn1cz39f6yxjibcp5xgrgg91n5bcxq1zfqf"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
-  ThresholdROC = derive2 { name="ThresholdROC"; version="2.7"; sha256="1r2bmik02fcrja8gl885apc0skpyw5d69y8qqphq0s1nbjq81s0n"; depends=[MASS numDeriv pROC]; };
+  Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
+  ThresholdROC = derive2 { name="ThresholdROC"; version="2.8"; sha256="0w5sxi6fgy3w1qj129g9z83822i7qx5s4js7dvzcdp2yfchj7pb3"; 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.4"; sha256="1i5qm6wwm6m0xrmr6dvk3pn6apxxqw9hznv8vypzwnky7bizkl90"; depends=[chron data_table fields]; };
@@ -4612,7 +4608,7 @@ in with self; {
   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.3"; sha256="0nq0w2j3n8ihzvz6sp3d33rhmwy1w2i7x30kyvq1s0cx65nn3ln5"; depends=[devtools forecast jsonlite locfit trend tseries]; };
+  TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.4"; sha256="0ihigrbdkfbqqjxqfx3y5q8ii8n60301s7190jr50a88l1xzgmh8"; depends=[forecast jsonlite locfit trend tseries]; };
   TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; };
   TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; };
   Tinflex = derive2 { name="Tinflex"; version="1.5"; sha256="15nbzr3q8rfrqywvlqi48r30fgq4lhlhp1fbnf12j49k6q2aixb1"; depends=[]; };
@@ -4620,7 +4616,7 @@ in with self; {
   TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; };
   Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; };
   TmCalculator = derive2 { name="TmCalculator"; version="1.0.0"; sha256="067xcpik00r6cdb4q1z09dgdqacyxqg21xn9nzvqfnp6s3nw6a9s"; depends=[]; };
-  Tmisc = derive2 { name="Tmisc"; version="0.1.20"; sha256="0f57wc35d2x2149y1bjswy54247wrwpvc8p77q07k1y5i71hm65k"; depends=[dplyr rstudioapi tibble]; };
+  Tmisc = derive2 { name="Tmisc"; version="0.1.22"; sha256="0h25k5xs8wnyzhl8alzlwircdl1hmclljjpcapnfg7na4yskzsaq"; depends=[dplyr rstudioapi tibble]; };
   Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
   TooManyCellsR = derive2 { name="TooManyCellsR"; version="0.1.1.0"; sha256="0cypjf4a9q2kw4gwxlr59nbwn25wrrhrcmpksxi2yhd3qhk71q8n"; depends=[cowplot ggplot2 imager jsonlite Matrix]; };
   ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; };
@@ -4628,8 +4624,8 @@ in with self; {
   TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; };
   TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; };
-  ToxicoGx = derive2 { name="ToxicoGx"; version="0.0.1"; sha256="07xm12rkjsvf1jswad1rdl8rl0dj93d8pkcgyyal3xmzjhib78d9"; depends=[Biobase caTools CoreGx magicaxis RColorBrewer reshape2 scales SummarizedExperiment]; };
-  TraMineR = derive2 { name="TraMineR"; version="2.0-13"; sha256="13b8dmb3a9m7cj5p1a0fpz28yaql55llf7wlc00acs2jwzs776k7"; depends=[boot cluster Hmisc RColorBrewer]; };
+  ToxicoGx = derive2 { name="ToxicoGx"; version="0.1.1"; sha256="06xkz08ppq99s7zrjpkb463rqj2vn7abgm50knac5hi5ixmirdlb"; depends=[Biobase caTools CoreGx data_table downloader dplyr ggplot2 magrittr RColorBrewer reshape2 scales SummarizedExperiment tibble tidyr]; };
+  TraMineR = derive2 { name="TraMineR"; version="2.0-14"; sha256="15lcyy9pwm5gfwihb6nkcjjhkl4jan12hfqrwa6rlzzv9z5304j5"; depends=[boot cluster Hmisc RColorBrewer]; };
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.6"; sha256="135s6aqkx18c364y9z0an0sbnwkgb2yrzxim3nd5khnbbnqdb5z2"; depends=[cluster RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; };
@@ -4639,13 +4635,14 @@ in with self; {
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
-  TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.3"; sha256="0b4pzz3rh8fgc2wn6gi0m6yfrpxv9nm91y15mg66lh0gbh5m7fxl"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.4"; sha256="0m6sny1xmb0sw7gg1jdds8q821g0pli5fx968c7y2smmmhxqv9rp"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
   TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; };
   TreeLS = derive2 { name="TreeLS"; version="1.0"; sha256="0iqayrwwzd308karhs2pjy2sdp4xg6ncsnah7f68liia1znnld5y"; depends=[BH data_table lidR magrittr raster Rcpp RcppEigen rgl]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
   TreeSearch = derive2 { name="TreeSearch"; version="0.3.2"; sha256="1h7s3i65n5j7mk2qxqyqy0h379jlszywh8hfmd93pn1yh01v3sz3"; depends=[ape clue colorspace memoise phangorn R_cache Rcpp Rdpack]; };
   TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
+  TreeTools = derive2 { name="TreeTools"; version="0.1.3"; sha256="084kizkldrqj0q7gwl6v7r2v1pazd78qdxwjhnadllcxqid54ay7"; depends=[ape colorspace phangorn R_cache Rcpp]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; };
   TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; };
@@ -4670,8 +4667,8 @@ in with self; {
   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=[]; };
   UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.4.0"; sha256="1m67ahh2k0mc8215nnb32r8nf9niax7y5nn3qpwg1fcav7g9ns66"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; };
-  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.9"; sha256="10f3rll9sf9792r8lbnbgx93f657ijwapi0xcam8liwvjl5q1qm8"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
-  UKgrid = derive2 { name="UKgrid"; version="0.1.1"; sha256="1p2s49lj1b2nyp8m8mif8cfsgxli8ii649gix1hlyn73gzrm8mjj"; depends=[data_table dplyr lubridate magrittr rlang xts zoo]; };
+  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.10"; sha256="10aansvqf2abgppk7mx9nr7ingy994qci59ikr8rv1y2hnfar2l2"; depends=[dplyr httr jsonlite magrittr readr rlang]; };
+  UKgrid = derive2 { name="UKgrid"; version="0.1.2"; sha256="135lvzaw4gjnc40aw28706fhiz7p06l1jhw830iyg03w2v4j0ar0"; depends=[data_table dplyr lubridate magrittr tsibble 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]; };
   UNPaC = derive2 { name="UNPaC"; version="1.0.0"; sha256="0mm5fqc5rdf24xw5kkh54nc3a0vp4vigkhl8wj14nyiw4xzi67lr"; depends=[glasso]; };
@@ -4689,32 +4686,32 @@ in with self; {
   Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
   Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; };
   Umoments = derive2 { name="Umoments"; version="0.1.0"; sha256="0vgfvfb7ggi353scg4a2kbwagazn7qfyvi3mjn7c9cprcx0w0136"; depends=[]; };
-  Umpire = derive2 { name="Umpire"; version="1.3.7"; sha256="1yg1vrz36jgni7pkl4ch095ckcdx177j2w28zb7s8scjpvm20h3z"; depends=[]; };
+  Umpire = derive2 { name="Umpire"; version="1.3.8"; sha256="1cxglmvzf4s97588x4hdky475wbzz74lay3ry076c7jxxx7pwipz"; depends=[]; };
   UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
   UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.0"; sha256="11vwf45bhgzzriwjjzjvbbwpzknbf6xl5s9ng7gxh58q20jy038j"; depends=[nloptr reshape2 rootSolve zoo]; };
   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="12.0.0-1"; sha256="1wpzj5jwmb9d9iz1xvgn8mc2xjri28g97k4lpafybb1v4xnxqk54"; depends=[]; };
-  UniprotR = derive2 { name="UniprotR"; version="1.2.2"; sha256="0d97ivbg87kpkvi2k9llagckr42qjyibzspi6a8sfzc5j8n0cqm6"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; };
+  UniprotR = derive2 { name="UniprotR"; version="1.2.3"; sha256="0xlszwlrfi51day88ailgwr88wn7n0fdc0ms39gqy5jcw0xc9yky"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; };
   UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; };
   UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; };
   UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; };
   UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; };
-  V8 = derive2 { name="V8"; version="2.3"; sha256="1cq5snck0hnjwchy92g5ysdabf70i5hjw3r3401sqv6nq5rdf87p"; depends=[curl jsonlite Rcpp]; };
+  V8 = derive2 { name="V8"; version="3.0"; sha256="07xmhmqbw0pvsc3vwpdkkx0j7f3nbgwlg7fii93gfrixxn8sjs1r"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
   VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; };
   VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; };
-  VBLPCM = derive2 { name="VBLPCM"; version="2.4.5"; sha256="1q5n87zzakdv0mflgsy6a5lc25ryjm7h90i3nr0dvccd0l8d4wpm"; depends=[ergm mclust network sna]; };
   VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; };
-  VCA = derive2 { name="VCA"; version="1.4.1"; sha256="0987c3xciijsnv57jfgdw0g0b9x97b1290bwzpa3j4ny42yrgndc"; depends=[lme4 Matrix numDeriv]; };
+  VC2copula = derive2 { name="VC2copula"; version="0.1.0"; sha256="1nm42zwb5a5nx2gpm48ihxkiw10vlcvx7jp8x5kmf233bhqiaszf"; depends=[copula VineCopula]; };
+  VCA = derive2 { name="VCA"; version="1.4.2"; sha256="16sm6580lm4rfnl2dr2g34cy545wxsbpvjc3pp73v47yhz3h1q59"; depends=[lme4 Matrix numDeriv]; };
   VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
   VDJgermlines = derive2 { name="VDJgermlines"; version="0.1"; sha256="1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h"; depends=[ape stringdist]; };
   VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; };
-  VFP = derive2 { name="VFP"; version="1.1"; sha256="0ffx57a1nkdc9p39a946ga9rxpc48f9r7xprxahmmdwiqp5d9m54"; depends=[gnm MASS]; };
+  VFP = derive2 { name="VFP"; version="1.2"; sha256="188lw1hfsjpimr9vfs078yq1a0c64nh0qnz6xncwxmi8qflln9zz"; depends=[gnm MASS VCA]; };
   VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; };
   VGAM = derive2 { name="VGAM"; version="1.1-2"; sha256="0kyan3a4ys2xbg9kf167cyf1gk7g963id62cjm2ij4i7y4wi61zq"; depends=[]; };
   VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
@@ -4729,6 +4726,7 @@ in with self; {
   VIRF = derive2 { name="VIRF"; version="0.1.0"; sha256="0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas"; depends=[BigVAR expm gnm ks matlib matrixcalc mgarchBEKK rmgarch]; };
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
   VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; };
+  VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.0"; sha256="1fsdxpd9vxnx7919a601g6qf2db8f1p7ch5bfrwc0x89y6abzavv"; depends=[dtw ggplot2 RTransferEntropy tseries]; };
   VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
   VOSONDash = derive2 { name="VOSONDash"; version="0.5.1"; sha256="1mg38fh7rrf1b2madk7lqqg0rmkh73hl20f920b4pdggqnrpmqq6"; depends=[httpuv httr igraph lattice magrittr RColorBrewer rtweet shiny syuzhet tm vosonSML wordcloud]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
@@ -4736,7 +4734,7 @@ in with self; {
   VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; };
   VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; };
   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.2.1"; sha256="05l3dlzryv68yk9za1vrbd4acn988s8ppkqj0i9kd88s8grjyj1d"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
+  VWPre = derive2 { name="VWPre"; version="1.2.2"; sha256="02fki480jxf869kaxawwyj9yznhqci8gmhxz45klayyghr90vd4g"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; };
   VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; };
@@ -4780,7 +4778,7 @@ in with self; {
   WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; };
   WRSS = derive2 { name="WRSS"; version="3.0"; sha256="16a7i6glgl5cshsn3w7gxviybmka06ylw5znz94gigyx0vhgv97p"; depends=[GGally ggplot2 Hmisc network nloptr]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.2.2"; sha256="0r8hsjx9d6qw7iih63gr5aj94dhvgmjxwz6ddx7qsa7vqy9hy7da"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.2.3"; sha256="061gzahn3sqzl7kn20k6151qf364sq048z765l0n8995rmv2z08b"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery 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]; };
   WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; };
@@ -4792,12 +4790,12 @@ in with self; {
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.0"; sha256="1sgpwdhg7snm0in93ky7jv8lgynnxwlmpgznyj747j7jl9cxz5qn"; depends=[FinTS forecast fracdiff rugarch wavelets]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
-  WeMix = derive2 { name="WeMix"; version="3.1.1"; sha256="0hg7ib3spfd5fp71gfbrh234wxinv3xswyaxb4gzd8342qg2xxhk"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
-  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.2"; sha256="0in0v19ns4ngnf89m4gxfpqqhnh2vp4h9cf8zcn8pgvr8nzd6f49"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; };
+  WeMix = derive2 { name="WeMix"; version="3.1.3"; sha256="0407ph8cbci4qwgk525r0y88iz45faq52ljlqa46q9076r9j7sng"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
+  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.3"; sha256="0l068mikd8ys7w2643kzmzy2qnj0khz3k780n1lm78ikzbk43sr0"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; };
   WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; };
   WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; };
   WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.7.1"; sha256="1wzazasnb24zpbsybb1jafzm3bdzmnk8nc09nflfiwwpmysfckax"; depends=[ggplot2]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.8.0"; sha256="0pw9pspyls0jk6w0i3dcwxmsfbvagncwgh1ilfgyq0v8mlilvr0y"; depends=[ggplot2]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
@@ -4815,17 +4813,18 @@ in with self; {
   WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; };
   WordPools = derive2 { name="WordPools"; version="1.1-1"; sha256="081qnsq7wn1vczgf6ipz8wjmyg4vwhj1s5nrzh0dw4p9yz28dxv2"; depends=[]; };
   WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; };
+  WorldFlora = derive2 { name="WorldFlora"; version="1.2"; sha256="1pjzxcnmkckq5r04lmsspyh4kijzjwk5aa6d8hpbfci63ab54dhp"; depends=[]; };
   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="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
-  XGR = derive2 { name="XGR"; version="1.1.6"; sha256="1y1g0n0idvixzl4bgwrccz77jcnmbb9ba760xal2y29sgshz6wpx"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; };
+  XGR = derive2 { name="XGR"; version="1.1.7"; sha256="1s65n4d67wj24rn6gi9hh3dlmghrxxjhm6nknhnsdjysab24njnv"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; };
   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.20"; sha256="0n28m8iz1wfgixr7fjswl238c5w9kggsrw0c8hdzp859dqvqdbs6"; depends=[]; };
+  XML = derive2 { name="XML"; version="3.99-0.3"; sha256="0lzpqwajs5xaqdna50vl24qkp9xvh00zypjjzy6kgdzk11isgdw1"; 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=[]; };
@@ -4837,7 +4836,7 @@ in with self; {
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
   Xplortext = derive2 { name="Xplortext"; version="1.2.1"; sha256="1c19i367vbcf8ikb364kz8488lcd5ignyagg9bhza282grhla7kn"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; };
   YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; };
-  YPPE = derive2 { name="YPPE"; version="1.0.0"; sha256="04rqirwh2al67lvlva68cab9slic9nqgj27mbsb14rb5i6f8mcfw"; depends=[BH Formula Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
+  YPPE = derive2 { name="YPPE"; version="1.0.1"; sha256="01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YRmisc = derive2 { name="YRmisc"; version="0.1.5"; sha256="0vdxw67j4sx3m713s2spvj7jlk9h2g9hg4169zabfah8ni7gdman"; depends=[ggplot2 gridExtra robust]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
@@ -4860,7 +4859,7 @@ in with self; {
   Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
   aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; };
-  aLFQ = derive2 { name="aLFQ"; version="1.3.5"; sha256="139fyb1zqr4ws2xkkv9i35m8pqmggyfig6mq2sgb84fkin7mgwfb"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
+  aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; };
   aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; };
@@ -4878,8 +4877,8 @@ in with self; {
   abcrlda = derive2 { name="abcrlda"; version="1.0.1"; sha256="0j29ifsvmxfx2g6v4bpbb4s6miwfpf4vlkpbgj6f2q078s4clc85"; depends=[]; };
   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]; };
+  abdiv = derive2 { name="abdiv"; version="0.2.0"; sha256="053l94br8sdy30078ssncq5i5zvdxa3m72ymbwbh0cm3zmsljj29"; depends=[ape]; };
   abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; };
-  abemus = derive2 { name="abemus"; version="1.0.1"; sha256="1dhllb184byp1yl15rg2w02zgw3iajag7cxshirg47mnmm7n70bb"; depends=[data_table]; };
   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.3"; sha256="0n4zps65y3zg0gfzlv97w91si52a9izkncirskbkj5x9hk0nhxcv"; depends=[devtools dplyr furrr future glue httr magrittr progress purrr readr rlang rstudioapi scales stringi stringr tibble tidyr]; };
@@ -4915,7 +4914,7 @@ in with self; {
   activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; };
   activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; };
   actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; };
-  actuar = derive2 { name="actuar"; version="2.3-2"; sha256="176ch6lbjn2f7vx2npjvl4y1j3l4v2g87g9sag2shvgh6sh5d7ix"; depends=[expint]; };
+  actuar = derive2 { name="actuar"; version="2.3-3"; sha256="0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih"; depends=[expint]; };
   ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; };
   adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; };
@@ -4938,12 +4937,12 @@ in with self; {
   ade4 = derive2 { name="ade4"; version="1.7-13"; sha256="16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m"; depends=[MASS]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; 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]; };
+  adegenet = derive2 { name="adegenet"; version="2.1.2"; sha256="01fgrgbiddz2q4l3mx637hhwbs7r0c43yw7vpwl8p8pwbm3nykz0"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
   adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.16"; sha256="0qzgshdlayx28j4ziivv1fy925bvbfnqk6dbd1wx5vjgp3c32ppg"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
-  adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.14"; sha256="17dgjvlpklaprbl9sqj1il1lrzxglqgcq2shjs1mbdzmkvnc30bb"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
-  adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.24"; sha256="14lpclp9w8v4fmribg619ay6jg6hn87866xn34d7swv861b5kf4i"; depends=[ade4 adehabitatMA CircStats sp]; };
-  adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.13"; sha256="1gp4ckx2qv26qbv07zwymsc12g265zihnsr25izf11bfpdgmf33r"; depends=[filehash sp]; };
+  adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.15"; sha256="1qhdwyjic4q24kk0pwrd0r8vdg5clv4g1hbdq07rl71jbcscdhvz"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
+  adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.25"; sha256="1v83iw9argh11fi47hlb8ykigd8xh70hww3i4j8yrzfqwcr9aj4p"; depends=[ade4 adehabitatMA CircStats sp]; };
+  adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.14"; sha256="0lfqg9g0wpq70md35b7gdgav3lliaxv8c8i13j3k0q436ids68iy"; 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]; };
   adept = derive2 { name="adept"; version="1.1.2"; sha256="0j8sd337j2c583pnwsfgc4r2251y8s5s4pkx79ifrhyc7c2qgfai"; depends=[dplyr dvmisc future magrittr tibble]; };
@@ -4952,8 +4951,8 @@ in with self; {
   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.9.2"; sha256="1ajq2889y70lxjdpf5zdg7zkz35i3i92li72wb7nbfngxmw47xzv"; depends=[awsMethods]; };
-  adiv = derive2 { name="adiv"; version="1.3"; sha256="0cmj9r8a6i6ag907g3a6likjz85vx7m6jrsfm3h2kwf29qr6d5lc"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phylosignal phytools rgl]; };
-  adjclust = derive2 { name="adjclust"; version="0.5.7"; sha256="059gzbnwkmy1l8yqbl8ksz80nm6pf917sxplp048jzx57sxpry2k"; depends=[capushe Matrix matrixStats]; };
+  adiv = derive2 { name="adiv"; version="1.4"; sha256="1gavg22hd0szxqiqws67j993xclgw79ifbqk0108nj13vjfj07kh"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; };
+  adjclust = derive2 { name="adjclust"; version="0.5.9"; sha256="1nrsl9ca7729qfmxi5xzsvkqrx3dkjyr3al4vz3iqphfxv9sdl4h"; 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.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; };
@@ -4962,7 +4961,7 @@ in with self; {
   admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; };
   adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; };
   adoption = derive2 { name="adoption"; version="0.6.2"; sha256="18mjhsh19bjmh27sv5fiay0xv1la0qy96v48b093f7kqfx4c21xb"; depends=[quadprog RandomFieldsUtils tkrplot]; };
-  adoptr = derive2 { name="adoptr"; version="0.3.0"; sha256="159g9wpxikw3x8g3h7j4ry2jndzq14zzwxrj6ajvnmgw115bqr2n"; depends=[glue nloptr]; };
+  adoptr = derive2 { name="adoptr"; version="0.3.2"; sha256="1s35wm1gkbygzbnma5mwpr60zml4yf74ip5fzkj0vfi77b3lclrr"; depends=[glue nloptr]; };
   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]; };
@@ -4971,16 +4970,16 @@ 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.25-1"; sha256="12n020y7rjm7402940gkqxa5j901p093f381i23p66fa3fyrshkf"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
+  afex = derive2 { name="afex"; version="0.26-0"; sha256="0h3p1svgk1ap3lj08fi8nzdb3710h99bv150krf1x8wci1a0r1if"; 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.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.2-2"; sha256="0pi9ja75gif10z716yzymasw49lq2yl4zk7aziqb6khfb9difqjp"; depends=[]; };
+  agop = derive2 { name="agop"; version="0.2-3"; sha256="1z90a07wzn5z4cbafwpfh3l3v1bgq9g89qbdjm51f78zynnb27dk"; depends=[]; };
   agriTutorial = derive2 { name="agriTutorial"; version="0.1.5"; sha256="0c0p0bqcrnx34q5brnvgq10wkzahvgyybaz2xfmcghbdvzahd2dx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
-  agricolae = derive2 { name="agricolae"; version="1.3-1"; sha256="18zkczb34nq0rpqprrgki62knivkxc95r9nmnmi2ckgpa39kz27f"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
+  agricolae = derive2 { name="agricolae"; version="1.3-2"; sha256="1g8pmmslc6kcx2bv16cc4alr3cwf69q8drr5pkyp1vq34hs0a8mf"; depends=[AlgDesign cluster klaR MASS nlme]; };
   agridat = derive2 { name="agridat"; version="1.16"; sha256="1kgmjrj207md86qivadkmv3s2gh3hi9zv63bsj8b9vlcd9f58pfk"; depends=[]; };
   agriwater = derive2 { name="agriwater"; version="1.0.0"; sha256="0m1dpv69nf3pjp63z3a5710skgb6sbrmjv6b8rxvq9lrw63993g9"; depends=[raster rgdal sp]; };
   agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
@@ -4994,15 +4993,16 @@ in with self; {
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
   aimsir17 = derive2 { name="aimsir17"; version="0.0.1"; sha256="0d3zygsnflymmfh7pflnynsf1klxjjyrqz5g5fnj2vwsicb40l4x"; depends=[tibble]; };
-  airGR = derive2 { name="airGR"; version="1.3.2.42"; sha256="0ll960jm0d56i0gn0g8yln0dvrhxc0b7kbhcfjsrshzb1lb3vq1v"; depends=[]; };
+  airGR = derive2 { name="airGR"; version="1.4.3.52"; sha256="0rknrfpyb6qs0ppai8qvqqvf89cvz8f4wk1xf03ks0i4aln1np44"; depends=[]; };
   airGRteaching = derive2 { name="airGRteaching"; version="0.2.6.29"; sha256="15sjwkyvgxihiz35qc8rg1f7f3vb4wdwbrfb37gx8mzql0mwqx4q"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; };
   aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
   airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; 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]; };
+  akc = derive2 { name="akc"; version="0.9.1"; sha256="034hm328fflpr9ppgr87sbwxj9hrmynq86c9nawwjlkv4daw9j7i"; depends=[data_table dplyr ggforce ggplot2 ggraph igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; };
   akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; };
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
-  akmedoids = derive2 { name="akmedoids"; version="0.1.2"; sha256="0grblrqaqdlvfjkv064kvk4bpaw1zygycbdzrhpfyaaqhc86rnqn"; depends=[ggplot2 Hmisc kml longitudinalData reshape2]; };
+  akmedoids = derive2 { name="akmedoids"; version="0.1.5"; sha256="0yn5rjgb5rrhphgbjn49098ybkmzda6yxzfqgbsppfgjidrafhza"; depends=[ggplot2 Hmisc kml longitudinalData reshape2 signal]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   alakazam = derive2 { name="alakazam"; version="0.3.0"; sha256="1jgamm75apjpij3yfzx62c44hfiyv1gdcmcb6n4hgbdszl2ii2bg"; depends=[ape dplyr ggplot2 igraph lazyeval Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; };
   albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; };
@@ -5011,7 +5011,7 @@ in with self; {
   alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; };
   algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; };
-  aliases2entrez = derive2 { name="aliases2entrez"; version="0.0.6"; sha256="1s27y74kv9gzrsqvmsaj1f548b095x6zy41dind3q8xrhl1d72rd"; depends=[AnnotationDbi doParallel foreach limma org_Hs_eg_db RCurl readr]; };
+  aliases2entrez = derive2 { name="aliases2entrez"; version="0.1.0"; sha256="043aglaygy0mx6299qvh7nng7x80d3b66najd9nbxc564vr0n4j2"; depends=[AnnotationDbi doParallel foreach limma org_Hs_eg_db RCurl readr]; };
   alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
@@ -5020,7 +5020,7 @@ in with self; {
   allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; 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.3.1"; sha256="0an9gnii30510fawsbzknrv20hqdwqh7214dzylh17y2b58g8sq8"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; };
+  alpaca = derive2 { name="alpaca"; version="0.3.2"; sha256="07r13gyqb876p6zx3pydl414zrgc473dnyn5ja6hmzjmkv19lw4k"; 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.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
@@ -5033,7 +5033,7 @@ in with self; {
   altair = derive2 { name="altair"; version="3.1.1"; sha256="0qy23lzz2lfsrhl9yn195r5gdkspgi99zlp13l1fpcw0d02diw1z"; depends=[assertthat htmlwidgets jsonlite magrittr repr reticulate rlang vegawidget]; };
   alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
-  amap = derive2 { name="amap"; version="0.8-17"; sha256="1il94bkhl8192vawq4gr2gwyhqhid27jr2312rhvr72ssg8p713b"; depends=[]; };
+  amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; };
   amber = derive2 { name="amber"; version="0.1.6"; sha256="0n9idgmkqnnsajybkbgczlrr1hyj5z98rixk451lh1r1j2cv8252"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; };
   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]; };
@@ -5044,6 +5044,7 @@ in with self; {
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
+  ampir = derive2 { name="ampir"; version="0.1.0"; sha256="1z9ha329fbji9jlly84cn7z2fxclk3n3w0xddq1mw1gqq3dyb8ba"; depends=[caret kernlab Peptides Rcpp]; };
   amt = derive2 { name="amt"; version="0.0.7"; sha256="1az11vi5kd1sp76xvgshvamyw59dydhp6g4m6c2wqcdll88dlfgn"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; };
   anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
@@ -5075,11 +5076,11 @@ in with self; {
   antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; };
   antaresRead = derive2 { name="antaresRead"; version="2.2.4"; sha256="0vi7g3mz92djxhraii788j4ialyvq013cw0grwndp2rz2bmxmgd8"; 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]; };
-  anthro = derive2 { name="anthro"; version="0.9.1"; sha256="1vm9gqxr81dllr6ib7r5w65rrfsawvif2fw6im2m6c7vljminlbg"; depends=[survey]; };
+  anthro = derive2 { name="anthro"; version="0.9.2"; sha256="15857msr80wqikf2rr7db3f8hhfwnaay10wnj27yig0yls46a99f"; depends=[survey]; };
   antitrust = derive2 { name="antitrust"; version="0.99.11"; sha256="025pm7n06yid28b34llm4rh0mlz0daz9ygh5z0hd87scp8f9gy00"; depends=[BB evd MASS numDeriv rhandsontable shiny]; };
   antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; };
   anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; };
-  anytime = derive2 { name="anytime"; version="0.3.6"; sha256="104dvgj3gh998yf93fy39lw76163n7ck9myscyi6v3znwkdwvhyv"; depends=[BH Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.3.7"; sha256="0vkckxaq1ga73iszwr4lyf12c1cann1w9lhflz4p3xdgx468fzb9"; depends=[BH Rcpp]; };
   aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; };
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
@@ -5093,7 +5094,7 @@ in with self; {
   apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
   ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; };
-  apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; };
+  apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
   apexcharter = derive2 { name="apexcharter"; version="0.1.3"; sha256="1kgn5bs329l2brrsd0qda87jgkjxa9ksm2plffl4v46nqkz53038"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang scales]; };
   aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; };
@@ -5114,8 +5115,9 @@ in with self; {
   apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
   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]; };
+  apyramid = derive2 { name="apyramid"; version="0.1.0"; sha256="0r0mx5m3jwjdw0npvlch4h6n73sy277wzcrffm6zz0ki9rkm0can"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-  aqp = derive2 { name="aqp"; version="1.18"; sha256="0r51pwz2wdq4fbrn2jcw9byb159m6gflxc9pwxp4klgzmmd64li3"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  aqp = derive2 { name="aqp"; version="1.18.1"; sha256="08mvh65b4i2dcrx4a4is4qpbmxdnzy2212b72l3xq6yppdzl2fhl"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
   ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
@@ -5123,7 +5125,7 @@ in with self; {
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
   archetypal = derive2 { name="archetypal"; version="1.0.0"; sha256="1b5c881balv4p0zr7bgg741mzfnw5fvg6ns303rsqashydxcnyiv"; depends=[doParallel geometry inflection lpSolve Matrix]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; };
-  archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; };
+  archiDART = derive2 { name="archiDART"; version="3.3"; sha256="01fmyp3f26v5rdgi00qyn139fgq55yxz5nhx223hg78qwrrbjvpw"; depends=[geometry gtools rgl sp TDA XML]; };
   archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; };
   arcos = derive2 { name="arcos"; version="0.8.2"; sha256="055sr3brad4p47d018s14zsxlqyzfcvk7zdkqfdi9bxqway8vm7q"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; };
@@ -5138,10 +5140,11 @@ in with self; {
   argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
   argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; };
-  argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
-  ari = derive2 { name="ari"; version="0.3.2"; sha256="1wa1ag1v2f3x9817w7q4vj1byxws95zm3b220nr196x9x4y9d8mj"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; };
+  argparser = derive2 { name="argparser"; version="0.6"; sha256="1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x"; depends=[]; };
+  ari = derive2 { name="ari"; version="0.3.3"; sha256="1gbbims0vqm3rnkrg064aa2h359hl4il4grdpy0va8hq3mrkvkrb"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; };
   aricode = derive2 { name="aricode"; version="0.1.2"; sha256="0w5ap0lhp9x67qvz3z80y49311g6h24x11yn8ziv75s3kaxy2wvz"; depends=[Matrix Rcpp]; };
   arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; };
+  arkhe = derive2 { name="arkhe"; version="0.2.0"; sha256="0qw5n73vzzkqlb7c1n4f38v3vlmc2cqwq59j4zqvs9h5ipbf15bm"; depends=[]; };
   arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
   armada = derive2 { name="armada"; version="0.1.0"; sha256="191iwf5y1za3wssawkyi9jcingfqqxcvv88hglpw6j7y3x5f47hf"; depends=[anapuce circlize ClustOfVar ComplexHeatmap doParallel FAMT glmnet impute mvtnorm qvalue VSURF]; };
   armspp = derive2 { name="armspp"; version="0.0.2"; sha256="098c59hdzr4ly8sx72xkcbjmiz5y65id1slsscwjji1yssb23lqq"; depends=[Rcpp]; };
@@ -5152,7 +5155,7 @@ in with self; {
   aroma_core = derive2 { name="aroma.core"; version="3.2.0"; sha256="1c4spy2sc80clz49irzilsqy65k6q2vl86qaydnymkzljcz7bbpg"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; };
   arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; };
-  arrangements = derive2 { name="arrangements"; version="1.1.7"; sha256="1amnpkgzmdwybfdqpc8c7v5h5cf19idmc552xsv7c7bmlclyrjv2"; depends=[gmp R6]; };
+  arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
   arrow = derive2 { name="arrow"; version="0.15.1.1"; sha256="0qdzq22x3cqfwa9a62rl718kbmq87rk3s0k17hsh5122sb8lwvh1"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect]; };
   ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
@@ -5160,19 +5163,19 @@ in with self; {
   arsenal = derive2 { name="arsenal"; version="3.3.0"; sha256="1bn1i5cdy6caw6ndqcfy41x3qb0hj3g4r8p4jl24gljygd3rvzgh"; depends=[]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
   arules = derive2 { name="arules"; version="1.6-4"; sha256="003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n"; depends=[Matrix]; };
-  arulesCBA = derive2 { name="arulesCBA"; version="1.1.5"; sha256="0mzsc9abnyj1fzvrdz26czrigmp96nhw6f832m69a2fqmld2qgkg"; depends=[arules discretization glmnet Matrix testthat]; };
+  arulesCBA = derive2 { name="arulesCBA"; version="1.1.6"; sha256="1b82am0sv5211x65r45k7pw52hfywv5i8zqr5asczdkx07s6273s"; depends=[arules discretization glmnet Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-22"; sha256="0m4g1mgc1swixq9z2v30bjvgnkqsjrinsmwqznrycxyzcgwbn8b3"; depends=[arules]; };
   arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; 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-5"; sha256="0nq388b9ma0a3p5l57v1b4js8i2a6n5rip3yi0zzzfwi3n3kxi77"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
-  asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.2.0"; sha256="1xh8ksxdf1i2p8pagppw1bw5s190yicpxcyc213ml3s0r4h071s5"; depends=[data_table haven miniUI readr rstudioapi shiny stringr zoo]; };
+  asbio = derive2 { name="asbio"; version="1.6-1"; sha256="0fhn0c743ndirqc9sbjq819xbrhjky2adk7nrjh2khjfbfrf0fw6"; depends=[deSolve gWidgets lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
+  asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.0"; sha256="1gfd1pqanxc3wsl1pmqc9csbzlffryvjkd1p2fa7b0kbwl1ln63s"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; };
+  asciicast = derive2 { name="asciicast"; version="1.0.0"; sha256="0vga88cq2hzi0bwq43n1yz5cm8kaag9xpg8v73gj06fb93lhha9x"; depends=[curl jsonlite processx tibble uuid V8]; };
   asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; };
   asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; };
   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-39"; sha256="170scg00a65kwbf7kx7lszgsgq243q5c2f0rs289qn2vqpf935b8"; depends=[assertthat doParallel etrunct foreach Matrix mixsqp pscl Rcpp SQUAREM truncnorm]; };
   asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; };
   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]; };
@@ -5180,7 +5183,7 @@ in with self; {
   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=[]; };
-  asremlPlus = derive2 { name="asremlPlus"; version="4.1-26"; sha256="01brccsfw4pqlcr7idaj11lhv75m8mb3wxsn1v2dvpka1sp8fdr4"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; };
+  asremlPlus = derive2 { name="asremlPlus"; version="4.1-36"; sha256="1qh6k1vf3a01dzllapjwrz7qw7bl2pxbbwij20pwhb4v8njpy1y7"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; };
   assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; 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=[]; };
@@ -5207,7 +5210,6 @@ in with self; {
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
   aster = derive2 { name="aster"; version="1.0-3"; sha256="1bcghw30db8m39fqza2msi6ahfn6yx7gaa3fzcmnxb8jrvrlpjgy"; 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=[]; };
   astrochron = derive2 { name="astrochron"; version="0.9"; sha256="14bzyp2927rklx9lfd3bikf5ck8irvr3s7266mh2245lyy79g9xi"; depends=[doParallel fields foreach IDPmisc iterators multitaper]; };
   astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
@@ -5219,6 +5221,7 @@ in with self; {
   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.5"; sha256="0jvlch6yhcz5azxj9yllah0x98plws5camxqis58qyqiapgvl9h8"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; };
+  atakrig = derive2 { name="atakrig"; version="0.9.5"; sha256="0lw4mx029aks0w1lhxv58v9r4c01rrayq79bapdbd8lf8ivpcp3n"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; };
   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]; };
@@ -5242,52 +5245,42 @@ in with self; {
   auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
-  autoFRK = derive2 { name="autoFRK"; version="1.1.0"; sha256="0yl6cj9nzib0xp75i0nd642yd0r0l51vwy3ivizqigjv4sq1pd2f"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; };
+  autoFRK = derive2 { name="autoFRK"; version="1.2.0"; sha256="0xj4wh8m0zjhbcp3s6gfyakkqp2i9dm19hij0nl1x02xz8gl9kij"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; };
   autocogs = derive2 { name="autocogs"; version="0.1.2"; sha256="11sjj6945099w499r6sgxx2vrz0aqx4bjjh6vklyfkjm6xvh4ckj"; 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.1"; sha256="1mwkrnyk7ygjmqbhpz86kzzmgk57q3kppp13m6rv2a65macbby2z"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; };
   automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
-  automl = derive2 { name="automl"; version="1.2.8"; sha256="1lc1cq4hrwcvx6vjvagq6a0ksdv18mnsy83sjc7bbrb8jab034s9"; depends=[]; };
+  automl = derive2 { name="automl"; version="1.3.2"; sha256="1nrg8q3y6rv69nmnsylg8rps4b4prx46j5a8ljlr24yc34504ck3"; depends=[]; };
   automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; };
   autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
   autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; };
   autothresholdr = derive2 { name="autothresholdr"; version="1.3.5"; sha256="1dvc21w57ir34vhcrbz58scl4ly057yn1ibmdkly99hwfkpihv3x"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; };
-  autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; };
-  av = derive2 { name="av"; version="0.3"; sha256="0gvd4ncr71ibcshdnhmm3y396q71pnk84jh3zpwhdxpvfah4haky"; depends=[]; };
+  av = derive2 { name="av"; version="0.4.0"; sha256="0r9z3iahrjlwpvcc29450c669576yprchg1znivq7p9lzff83plc"; depends=[]; };
   available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
-  avar = derive2 { name="avar"; version="0.1.0"; sha256="00pp2irhw04jry545l4hvklf25aphdrz8djrhxx2936icgxz5kw4"; depends=[Rcpp RcppArmadillo simts]; };
+  avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; };
-  aws = derive2 { name="aws"; version="2.3-0"; sha256="12gp0jv63hrvbjl38ksdb024c79bgglvzvl2j32z2kjdd2lhi90b"; depends=[awsMethods gsl]; };
+  aws = derive2 { name="aws"; version="2.4-0"; sha256="1jwa2n8n4ngznd8na89gnab97m94sz4bsmd3fld5h4pppilac80h"; depends=[awsMethods gsl]; };
   aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; 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.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; 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_polly = derive2 { name="aws.polly"; version="0.1.2.1"; sha256="10wr30a52m0nq3a6bqqvfzic86g5sq485zy5xfgay2y5ivsdz6k8"; depends=[aws_signature httr jsonlite tuneR]; };
+  aws_s3 = derive2 { name="aws.s3"; version="0.3.12.1"; sha256="1nwj5yqgqpc475cia39x5277w9jalm6lmsa4j3spcr254qdkjl7q"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; 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]; };
-  aws_translate = derive2 { name="aws.translate"; version="0.1.3"; sha256="0qr38f2ywrmccg0k080lhfvvf9zkmclvpmfcwjizls6qkwfww3il"; depends=[aws_signature httr jsonlite]; };
   awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; };
   awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
-  awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; };
   azuremlsdk = derive2 { name="azuremlsdk"; version="0.5.7"; sha256="1r9s1avkr03hradzr66lz7xxz4s6ax8d6amxkhcnphyaykss8gh1"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi]; };
   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-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; };
-  bWGR = derive2 { name="bWGR"; version="1.6.5"; sha256="1knc2sg39kvwmx66vd1cm42wydw0ymg9fpic3snd8dwq4ih0jf5i"; depends=[Rcpp]; };
-  baRcodeR = derive2 { name="baRcodeR"; version="0.1.3"; sha256="06fk70d52c4vi5bc42wljpxkvr3n45likhvs5b5r0lpw4himy1fm"; depends=[DT miniUI qrcode rstudioapi shiny]; };
+  bSims = derive2 { name="bSims"; version="0.2-1"; sha256="024k9s42a9w5pmw024b15sj5ilcfpkm7lv59yimjicr9lmw246kb"; depends=[deldir intrval MASS mefa4 pbapply]; };
+  bWGR = derive2 { name="bWGR"; version="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; };
+  baRcodeR = derive2 { name="baRcodeR"; version="0.1.4"; sha256="17vf4rrw6p2b7ynxgldc7f24i8ml7h486ip2mv60gj4kz1cjzx0y"; depends=[DT miniUI qrcode rstudioapi shiny]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; };
+  babette = derive2 { name="babette"; version="2.1.1"; sha256="1zfc1xlaqrwbg0q9bzxbc7s1jqy2cnip1dmw9qgacxnjwxmz8hj2"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; };
   babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; };
   bacistool = derive2 { name="bacistool"; version="0.9.9"; sha256="06734pi829xhfkpdhysa62x1sc0shhbdn6l9vls2cyfr30w6y6md"; depends=[rjags]; };
   backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; };
@@ -5295,23 +5288,23 @@ in with self; {
   backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; };
   backports = derive2 { name="backports"; version="1.1.5"; sha256="0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"; depends=[]; };
   backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; };
+  bacondecomp = derive2 { name="bacondecomp"; version="0.1.0"; sha256="120whsc3sjwq4y30kk81k2lkcqwpvzcd3z44xkl8nlfzd2gn20w3"; depends=[]; };
   bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
   badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; };
   badger = derive2 { name="badger"; version="0.0.7"; sha256="1djgzn6ixfsdr0v4f3714mv2z2kl776dd2hq670g7bla4lp6344s"; depends=[desc dlstats rvcheck]; };
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
   baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; };
-  baggr = derive2 { name="baggr"; version="0.2.0"; sha256="0hg7wxyq072vf1sqbiai9lgfc01k2l7v99nnlmlgy1m3r3m5f631"; depends=[bayesplot BH crayon ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; };
-  bain = derive2 { name="bain"; version="0.2.2"; sha256="08cgqba073hkisg122612va8ry971cvqs564gg9c7cfyipg5rilz"; depends=[lavaan]; };
+  baggr = derive2 { name="baggr"; version="0.3.0"; sha256="084w2a5y0d060hihl5n88ai4pbg312g6y5lapy4kb2qcjd7i9zg1"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; };
+  bain = derive2 { name="bain"; version="0.2.3"; sha256="0n5z9sdvjbx1xagxyvyiqdwyxrlkfd2vjnrzhlshamr4xh0csa48"; depends=[lavaan]; };
   bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
   balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; };
-  ballr = derive2 { name="ballr"; version="0.2.4"; sha256="0b9y5cr2qwgdnhv15ir7d3fiajg9lzccs0k8v19gq491201ssa1w"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
+  ballr = derive2 { name="ballr"; version="0.2.6"; sha256="0434b7hr5lcz2f7mdfkkmvh407ypyycki0bjda6lgiy0pr22hwsc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
   bama = derive2 { name="bama"; version="0.9.1"; sha256="1yx0gv5qxq3si5vzrrjy8y6d3b0v433aljyniyx9dp6q6mcqrhvw"; depends=[Rcpp RcppArmadillo]; };
   bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
   bamlss = derive2 { name="bamlss"; version="1.1-1"; sha256="06i0yfmq5k98yqs8mfw3ppkanlp34v18fb1xynxaxwgj9d58h5k3"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
-  bamp = derive2 { name="bamp"; version="2.0.7"; sha256="0yrqy4cj6wq98d5yfm9ahzhp2giwyqzd93s2fhxb8r4mzza5i9hm"; depends=[abind coda]; };
-  banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
+  banR = derive2 { name="banR"; version="0.2.1"; sha256="0bqy8srxsd0r872scpij8lyrvb0n8jicwpvf9wh1xk1bjmlq3vb5"; depends=[dplyr httr magrittr purrr readr rlang 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.1"; sha256="0ndm4z6gkd9flxsh1sx08c5ahm8297hzn8f5hc1mpn5m998ajjsj"; depends=[]; };
@@ -5335,7 +5328,7 @@ in with self; {
   basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; };
   basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.4"; sha256="03mggvdasqrkq41dpfwsrhnxh98hfqfr3z58hrfhnjrzydwxbci9"; depends=[]; };
   basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; };
-  basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; };
+  basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; };
   basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
   basket = derive2 { name="basket"; version="0.9.10"; sha256="1773f0abhz854sdb0jfhmfpgxpkagb3x6mzi77jycfl6ywhry48h"; depends=[cli crayon dplyr foreach GenSA ggplot2 gridExtra igraph itertools RColorBrewer tibble tidyr]; };
   bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; };
@@ -5343,11 +5336,11 @@ in with self; {
   batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
   batchscr = derive2 { name="batchscr"; version="0.1.0"; sha256="094l2cq7lcdrlsdmsxmbal7srxdg20rxbms46h1sd414wq26d413"; depends=[]; };
-  batchtools = derive2 { name="batchtools"; version="0.9.11"; sha256="02mj21ypcjv5fs7ajf63p6bq0cyvihdl55hlpqx6kmsfjin1cr0v"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.12"; sha256="16x524hvy9d8p7r4fi1c8mixcvzgsjbf3y0vxaa56ssbbab4p7f9"; 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]; };
   baycn = derive2 { name="baycn"; version="1.0.0"; sha256="1wjm7isdvb4z5lyhix849sxzngbmk8ccdvc8qgjgdcfmnx15binq"; depends=[egg ggplot2 MASS]; };
-  bayes4psy = derive2 { name="bayes4psy"; version="1.1.1"; sha256="08fziwvsdwwwpk5hjsh8r9n920qqcwz5j5566p3m78dm5dsjkl7x"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; };
+  bayes4psy = derive2 { name="bayes4psy"; version="1.2.0"; sha256="0dv285nq44a971hyha8rkynac3gaq78pp5bicmznxds53lhnw2ji"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; };
   bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; };
   bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
   bayesCT = derive2 { name="bayesCT"; version="0.99.1"; sha256="1ylv7l4rs4sb7lld6m2w02xg9g26fm8z9jdrszbjc18z1f4bm78j"; depends=[bayesDP dplyr magrittr purrr]; };
@@ -5379,8 +5372,8 @@ in with self; {
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
-  bayest = derive2 { name="bayest"; version="1.0"; sha256="0ysfy96s9pk0xw0rzygf43c5jpj9j37kap3cd6w3m6361a0dw8mj"; depends=[]; };
-  bayestestR = derive2 { name="bayestestR"; version="0.4.0"; sha256="1d3f50rzjzgzclwd6j887dssyhv7hdq7pik9nnlr3w775v3f69zc"; depends=[insight]; };
+  bayest = derive2 { name="bayest"; version="1.1"; sha256="0nl3zq5bp6yqw351vcrzph5y0jn9bml7isf4nsxl7braivalf72n"; depends=[]; };
+  bayestestR = derive2 { name="bayestestR"; version="0.5.0"; sha256="172ilq2h8gkn6ggxafvkjq7bgjs2rymm15w5b4ql7i8cv41cdll2"; depends=[insight]; };
   bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; };
   bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; };
   baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; };
@@ -5390,18 +5383,17 @@ in with self; {
   bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
-  bbl = derive2 { name="bbl"; version="0.2.0"; sha256="027awr8xx86wv6xhpj4ywwgldmmf2ln5161ak51kqnygfdavy8bc"; depends=[pROC RColorBrewer Rcpp]; };
-  bbmle = derive2 { name="bbmle"; version="1.0.20"; sha256="1xzij7swrrzl5ly8l3lw6awh486zcm00251dwqws1y23fbgyh3vc"; depends=[lattice MASS numDeriv]; };
+  bbl = derive2 { name="bbl"; version="0.3.0"; sha256="0vlmdxhq9vgyff6sab6i90rq54z09kqdckysmhfcdr05zfwgcd5l"; depends=[pROC RColorBrewer Rcpp]; };
+  bbmle = derive2 { name="bbmle"; version="1.0.22"; sha256="1idn55w5f3iw4r0ydyww8xyinninw07sxlwfqb565vmdrs87dwl4"; depends=[bdsmatrix lattice MASS Matrix mvtnorm 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-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=[]; };
-  bcdata = derive2 { name="bcdata"; version="0.1.1"; sha256="0qygwdly1k6g9zr1qbf21ylnq3713724d1ninw99syirz5knk16k"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf xml2]; };
+  bcdata = derive2 { name="bcdata"; version="0.1.2"; sha256="0h5mrcpq64d2i9q6m5n8bq4g06zfyyscllwg6k1zm22vsw1yi1ki"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tidyselect xml2]; };
   bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; 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.18.0"; sha256="0zq5fp9r6n2mpjd96ri7lmp63g8lm5sjwgfmc4cligrch3kakzxy"; depends=[httr rappdirs sf]; };
   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]; };
@@ -5413,14 +5405,13 @@ in with self; {
   bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; };
   bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
-  bdl = derive2 { name="bdl"; version="1.0.0"; sha256="1nnzjg3qblx9x8s113104kdpxvq708s9qgnilr3sjasfny50b49b"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr purrr randomcoloR sf tibble tidyr tmap tmaptools]; };
   bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; };
-  bdpar = derive2 { name="bdpar"; version="1.0.0"; sha256="0f5hwm4j4m8q1jgyal710p6s1hwc05kxzmcp3zsavwm8qzcc9s60"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; };
+  bdpar = derive2 { name="bdpar"; version="1.0.1"; sha256="1i0xhw0nqdpmmddvfp4scf3wgld7ng2pcw8685grv5vxrlgc308p"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; };
   bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
   bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; 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=[]; };
+  bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-4"; sha256="1sh6pg43rgqvips4fx0k4vmp5i9lmniix0bqwj2yq5m06gs227i5"; depends=[]; };
   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]; };
@@ -5441,8 +5432,8 @@ in with self; {
   behaviorchange = derive2 { name="behaviorchange"; version="0.2.1"; sha256="12dakzc3k85na3wvnwisynpzy4i2vw2i2amkrf4lf6rahn0rkfs1"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr ufs viridis]; };
   behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
-  belg = derive2 { name="belg"; version="1.0.0"; sha256="02n4i0kyxdxwgq7qqjqa4pwsxmmp0cksn0jrj5dvlvpflf1naicg"; depends=[Rcpp RcppArmadillo]; };
-  bench = derive2 { name="bench"; version="1.0.4"; sha256="1vb31jx4rwri4ywm9jlib65nn2avirvyd40af8zz5i3sl684ypg9"; depends=[glue pillar profmem rlang tibble]; };
+  belg = derive2 { name="belg"; version="1.0.1"; sha256="162f3rayxz05qzfbry4x98aissyd8gzcp7aa1x59q0vl8jd5dcid"; depends=[Rcpp RcppArmadillo]; };
+  bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmarkme = derive2 { name="benchmarkme"; version="1.0.3"; sha256="003d97rs0gb6l6hq7d4lxgdngrgb5lii6fxw2n7l50m14hib2sv2"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; };
   benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.3"; sha256="1qiw9d93y4m2ch20hsgvf1k3r9dqf60mrdr6cc647m1qv2syjgrk"; depends=[dplyr tibble]; };
@@ -5454,6 +5445,7 @@ in with self; {
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
   berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; };
   bestNormalize = derive2 { name="bestNormalize"; version="1.4.2"; sha256="0df4fspcmf8scifgy2v69qlqp7zzyicjmscmyxp1m8wzd7cwzd0q"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; };
+  bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; };
   bestglm = derive2 { name="bestglm"; version="0.37.1"; sha256="13wd1jnh9d82s4qz81k78y1v47ld0csdgn9k4izca2g039jqjxmq"; depends=[glmnet grpreg lattice leaps pls]; };
   betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
@@ -5471,26 +5463,26 @@ in with self; {
   bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; };
   bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; };
   bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; };
+  bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; };
   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.6"; sha256="1djxkls963j97j76a15zxdx4rfhwrpis7i1wqal0v780f2c576a9"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; };
+  bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; };
   bhrcr = derive2 { name="bhrcr"; version="1.0.3"; sha256="1w52f4ghl328vdcr8hwvmdrnxnj45fy4r21yqzg5q1fpd4mpjw2i"; 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.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; };
   bibliometrix = derive2 { name="bibliometrix"; version="2.3.2"; sha256="02sikbjnsfd1gxwlbdiafp35af22gmz2p6i951l3syxpcvylxfc8"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 rio RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; };
-  bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
+  bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; };
   biclique = derive2 { name="biclique"; version="1.0.4"; sha256="0jflbl1fbi3v3igi447f8i2zs9vh84xk1rci6dmwm0k9s9zqfrs2"; depends=[]; };
   biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; };
-  biclustermd = derive2 { name="biclustermd"; version="0.1.0"; sha256="0d2fa6lainnkdzn1mq8pbxlc14hvlgfi3pcxw9rwqfjhxp6wkkig"; depends=[biclust clues doParallel dplyr foreach ggplot2 magrittr nycflights13 tidyr]; };
-  bife = derive2 { name="bife"; version="0.6"; sha256="1fmzmzq3hxr9kzqq5zmmsm2927vjb5mj08g2pnzljhmvsn2b7x3y"; depends=[data_table Formula Rcpp RcppArmadillo]; };
+  biclustermd = derive2 { name="biclustermd"; version="0.2.0"; sha256="075qr8bizwf08zac87a0xhhcgf1d3qvdd29jwl79yd63vlczf38k"; depends=[biclust clues doParallel dplyr foreach ggplot2 magrittr nycflights13 tidyr]; };
+  bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
-  bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; };
   bigKRLS = derive2 { name="bigKRLS"; version="3.0.5.1"; sha256="1za8pxij1nwpdz3lz51zqib99pc73s92lz0k01fkcgw5rj78kgs8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
   bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.5.0"; sha256="051c8rkj77dm78237dzhf3lcdawv0xv72pwfiim9bi89z9mp6f9m"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
-  bigalgebra = derive2 { name="bigalgebra"; version="0.8.4.1"; sha256="19j5f7d6yf9g0glybdwahj7n0mrgbxrbdajh7s30v25fkmm36r2z"; depends=[BH bigmemory]; };
+  bigalgebra = derive2 { name="bigalgebra"; version="0.8.4.2"; sha256="0xgaks6yx6gh333g27rij28hhxlziknxaqw5cbw1cr7srdl295i9"; depends=[BH bigmemory]; };
   biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; };
   bigassertr = derive2 { name="bigassertr"; version="0.1.1"; sha256="0jyycg9qkqswqakbc2p80s7qrv0hm3mn0zwg4v373zcf4z21rvlh"; depends=[]; };
   bigchess = derive2 { name="bigchess"; version="1.5.2"; sha256="021l5pvbh6v95wavxl118k2gvlaadwr18d8f712jzarcnfi1hvy3"; depends=[ff ffbase RSQLite subprocess]; };
@@ -5502,14 +5494,14 @@ in with self; {
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
   biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; };
   bigmatch = derive2 { name="bigmatch"; version="0.6.1"; sha256="1s9i42h82cdp4qqdpw11dmymvrz0f9vj14ibyrlqjkg18lpz0m5y"; depends=[liqueueR mvnfast plyr rcbalance]; };
-  bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
+  bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; 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]; };
-  bigparallelr = derive2 { name="bigparallelr"; version="0.1.2"; sha256="1c6vw03xk4fhl5rlgajznw5rlfklsi59srncd51s24fj2avvr8ww"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; };
+  bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; };
   bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; };
   bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; };
   bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; };
-  bigstatsr = derive2 { name="bigstatsr"; version="0.9.1"; sha256="0v0rxp45lbv5bmvyfkm1v4l2rr7g1rfymi547y10b2zysllbfbr0"; depends=[bigreadr cowplot doParallel foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; };
+  bigstatsr = derive2 { name="bigstatsr"; version="1.1.2"; sha256="1bp53gbsgxlizv9vq68scbadiq08isvzl0iv9nwa22ywlpaabybf"; depends=[bigassertr bigparallelr bigreadr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; };
   bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; 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=[]; };
@@ -5519,7 +5511,7 @@ in with self; {
   bikm1 = derive2 { name="bikm1"; version="0.9.0"; sha256="09ibaj5nd7ql5l30z726nifym5bnmkx4nbw982p9h2440rdx0g5b"; depends=[ade4 ggplot2 gtools pracma reshape2]; };
   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.7"; sha256="02k90rhz2pawy83kp0rjzvl94s02x41a53diqfva357p8w9k6z48"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales]; };
+  billboarder = derive2 { name="billboarder"; version="0.2.8"; sha256="1n51xildr8h3fqm3yhalgvq6pwlpzbcv230jg7skp8147wmwcmi7"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales shiny]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   bimets = derive2 { name="bimets"; version="1.4.2"; sha256="13gv3p3mldmdwvbvivh4fx8ygmjvf0gza69gprv4z1wphb6rz7yn"; depends=[xts zoo]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
@@ -5541,6 +5533,7 @@ in with self; {
   binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach 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]; };
+  binomialMix = derive2 { name="binomialMix"; version="1.0"; sha256="01l3083bc6k2n18nfi1alc737l5zcankv30f4i0z3ajlqpd2jqr9"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; };
   binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
   binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
   binostics = derive2 { name="binostics"; version="0.1.2"; sha256="1izcck2dq8ay9ni1wjg426w5rj39gxwzls1sgnngggapl3pmqzz2"; depends=[]; };
@@ -5550,19 +5543,19 @@ in with self; {
   binsreg = derive2 { name="binsreg"; version="0.2.0"; sha256="031a794bkb9qdy51p4jgjg3hvh8ga0hwakcdrjn0hv4ls9f5gsm7"; depends=[ggplot2 sandwich]; };
   binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
-  bio3d = derive2 { name="bio3d"; version="2.4-0"; sha256="0ikpk1ppdp50m9kd289z616i382j9i7ji1zchyd4xqfyk8lnxf4s"; depends=[Rcpp]; };
+  bio3d = derive2 { name="bio3d"; version="2.4-1"; sha256="07rw6c2d95gb5myxh31727j0jrchd0xisa3x89jjmf4zzs3vv7v7"; depends=[Rcpp]; };
   bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   bioRad = derive2 { name="bioRad"; version="0.4.0"; sha256="100b1fz7dxpvsc452r4yvd4g6gmzz80pvw1l0sp6g4310gyzs2fb"; depends=[curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp]; };
   bioacoustics = derive2 { name="bioacoustics"; version="0.2.2"; sha256="13m5w888fap7nxn3pwimi04zdp848n20ha01v7gkzdkchdnbbchb"; depends=[htmltools moments Rcpp stringr tuneR]; };
   biocompute = derive2 { name="biocompute"; version="1.0.3"; sha256="1c23yd0vhar1hvzskr7h6g3a78mcrwminm2pkdmc9qlpy8s8smvv"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; };
-  biogas = derive2 { name="biogas"; version="1.10.3"; sha256="1qfidjwhaxg5zplzkldhj4zqg81xrcqmvh9x5km5yhyymzr6y4vs"; depends=[]; };
+  biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
-  biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
-  bioimagetools = derive2 { name="bioimagetools"; version="1.1.3"; sha256="1xl5q45s4amvinfzysf5za0myq1f76xvqhyza0b191bky5vk8qq1"; depends=[EBImage httr tiff]; };
+  biogram = derive2 { name="biogram"; version="1.6.1"; sha256="0n9ahj0lbq3hsk6v9brjwqh3iha5dyg2xn5kngn8m8rvl0flf9k2"; depends=[bit combinat entropy partitions slam]; };
+  bioimagetools = derive2 { name="bioimagetools"; version="1.1.4"; sha256="078xqgq4bgphzflfajxnyfxrmhs28224abby0fq5q9bh1hngkn58"; depends=[EBImage httr tiff]; };
   bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; };
   biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
-  biomartr = derive2 { name="biomartr"; version="0.9.0"; sha256="0178y8m31rkzgrp7dnx9rbwvjfybvb342d5a3y67z6mkha90iiq2"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; };
+  biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; };
   biomod2 = derive2 { name="biomod2"; version="3.3-7.1"; sha256="0g8knlkrxlwxbh1qzxhv2lf1zxrlqf7s6yhzvch18y8w021d8d9c"; depends=[abind dismo earth gbm ggplot2 MASS mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; };
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; };
@@ -5573,7 +5566,7 @@ in with self; {
   biostat3 = derive2 { name="biostat3"; version="0.1.4"; sha256="12inmmy5xjd0c6vs2s00z13rm5ykndxpmmgi8h7pkw30rhq4snyc"; depends=[car MASS muhaz survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
   biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
-  bipartite = derive2 { name="bipartite"; version="2.13"; sha256="11l8lialvb02wwk6q81sq0i48v422rcvxxbkz74la820a2qzdwcx"; depends=[fields igraph MASS permute sna vegan]; };
+  bipartite = derive2 { name="bipartite"; version="2.14"; sha256="0wy7ciw59b7z2gzp5qiphss9p208qf6dyprl59nksb462fg4rxyq"; depends=[fields igraph MASS permute sna vegan]; };
   bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; };
   birdring = derive2 { name="birdring"; version="1.4"; sha256="0rskrf0r5nrzfcac0zvc60vabvs9dws2zx1rxssvw6xmwyiiy1z6"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
@@ -5583,11 +5576,10 @@ in with self; {
   bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; };
   bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
   bisque = derive2 { name="bisque"; version="1.0.1"; sha256="05rx8fcmb46486iqxgkcf69dih80iwswx41ml1f5d2dnjf5b1p34"; depends=[doRNG foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; };
-  bit = derive2 { name="bit"; version="1.1-14"; sha256="0m7jrqzpa1pk8ixcl814x06jf96nlvvr16x6did6cfk4zghsrfjw"; depends=[]; };
+  bit = derive2 { name="bit"; version="1.1-15.1"; sha256="0y351ajlrn9ywbiai46mjpwmw5pqc9ik2z24rf0bnbdcvaxdr7r8"; depends=[]; };
   bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; };
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
-  bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; };
-  bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.0"; sha256="0vl6d6pyb0v634l5n1zbkbkv73swx0pcgw5lvbdcf368b3hwlhk2"; depends=[]; };
+  bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; };
   biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
   bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; };
@@ -5607,14 +5599,14 @@ in with self; {
   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]; };
+  blink = derive2 { name="blink"; version="1.0.0"; sha256="1a1rc4k78604ypgwrb3ysd2ak27vqhbwjn662mrr4a36kgw1z0w3"; 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]; };
   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.3"; sha256="0yxwzx8s297mvvr5yspsl1dn3x1pnkxm0sagy7ivi98d2x9y8yn7"; depends=[arm lme4 MASS MuMIn]; };
-  blob = derive2 { name="blob"; version="1.2.0"; sha256="08z071jzac4gasgfgab0y5g3ilfmlw08ln813wphxg07hsiczw8s"; depends=[prettyunits rlang vctrs]; };
-  blockForest = derive2 { name="blockForest"; version="0.2.3"; sha256="19s1v3q489zns09lf00jsqlr5v9yi2drfykg2zh0gp0q4clpwmvj"; depends=[Matrix Rcpp RcppEigen survival]; };
-  blockRAR = derive2 { name="blockRAR"; version="1.0.1"; sha256="043x5110vzjq53cq02xnw3482jgkx86fabd11q8c0ddzg4i88ag7"; depends=[arm bayesDP dplyr ldbounds magrittr tibble]; };
+  blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; };
+  blob = derive2 { name="blob"; version="1.2.1"; sha256="1slb5mvxfyi92i8ifx2qa31hp57inilwhq1g9lzvgha6jrxbqm7g"; depends=[rlang vctrs]; };
+  blockForest = derive2 { name="blockForest"; version="0.2.4"; sha256="14xggdm34hmdlz3hvvp5layk6mb016yppqf9x9rbia9lmmjbhgfh"; depends=[Matrix Rcpp RcppEigen survival]; };
+  blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
@@ -5626,7 +5618,7 @@ in with self; {
   blorr = derive2 { name="blorr"; version="0.2.1"; sha256="1lvh5jr1jidrkwidpy6plzd58p8q3rxa23wl4xsf8milw180w69p"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; };
   blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; };
   blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; };
-  blscrapeR = derive2 { name="blscrapeR"; version="3.1.6"; sha256="0p1lwl3zlah0x9jwvd7qmh8q3ynqz48wj6xvzyj7c9rl0iq2ws5x"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; };
+  blscrapeR = derive2 { name="blscrapeR"; version="3.2.0"; sha256="0dq9yg9xik715b36vc3fch4ab3njqa22w7b7b905b9gyagkv2zbv"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; };
   bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; };
   bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
@@ -5636,29 +5628,30 @@ in with self; {
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
   bmlm = derive2 { name="bmlm"; version="1.3.11"; sha256="1nlwfrs6kk2jxq8vxwfj388cdf2p8h81lskkb9bp80fp8fx722qh"; 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]; };
+  bmotif = derive2 { name="bmotif"; version="2.0.0"; sha256="1vvh20hzf2nfc28pp2vjgip3xjv617lawfjawd51v3xmfnk3bvj2"; depends=[gtools Rcpp reshape2 tensor]; };
   bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; };
-  bnclassify = derive2 { name="bnclassify"; version="0.4.3"; sha256="1bh1l57xzbj6cj21lslxw5b79x3jmm2wyv24smdyrgyi8s6mvj7v"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
+  bnclassify = derive2 { name="bnclassify"; version="0.4.4"; sha256="1jjyqh850glllvghgfbxsji6yw1grzyxm59pcbxkwm3yynviq0ml"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
   bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; };
+  bnma = derive2 { name="bnma"; version="1.0.0"; sha256="1gaplf5lw7x6nfihk6n0kyf67vx4d8zq6mylhwlmfhpfrpiy030k"; depends=[coda ggplot2 igraph rjags]; };
   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]; };
   bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; };
   bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; };
-  bnpsd = derive2 { name="bnpsd"; version="1.1.1"; sha256="1vvs7rbnqfs1h4naff8rjvipm93v86ay65rmqpqhr2zf3d8ygc29"; depends=[]; };
-  bnspatial = derive2 { name="bnspatial"; version="1.1"; sha256="1mgqll65b1kngg89nf9vc4zlwr0qy2y3zzxd0wgqnywp31mhwpzi"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; };
+  bnpsd = derive2 { name="bnpsd"; version="1.2.1"; sha256="1jnv0pnq5fd5pyy1rx4cbrxl715ss2ci3p9k6zwz5s9x1kxhvgd9"; depends=[]; };
+  bnspatial = derive2 { name="bnspatial"; version="1.1.1"; sha256="1drm9ia4lr80wahbbn9xrw658ppmgxm4iadwv77jz1x786dda2n1"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.6"; sha256="1vnjjv8ms8hvd21zsgyl056s266a1plp7ybdmnkl2cy3n8jpdwi1"; depends=[bitops igraph Matrix]; };
   bnviewer = derive2 { name="bnviewer"; version="0.1.4"; sha256="1g9zllgbkx274nsarx7q4nxsjq2wwgrfh231xbqzrsjwdnjzlbf7"; 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.9.0"; sha256="0ppdhbpdffvs0sgh7ykkhr585nhk66w6vqw793wa4ia57yl49s25"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
-  bomrang = derive2 { name="bomrang"; version="0.6.0"; sha256="0lnrv274lhl4n9rngkwx63dgd765bv0bd0mq9gz0vh8msmxnih0z"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; };
-  bookdown = derive2 { name="bookdown"; version="0.16"; sha256="1gwgvx1yg6q3wccnhidr3gshdvlgr42i4pvlg4h29kpsa7smjiv1"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
+  bomrang = derive2 { name="bomrang"; version="0.7.0"; sha256="0xlsivhnank7bc3y06wk5avlzlc24mfvn9c18rhgxxib8mzf8aak"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; };
+  bookdown = derive2 { name="bookdown"; version="0.17"; sha256="10b4gnd6z3w13pysqqan43blxcbk7bgbzc7wr83b23ag1lh2n40j"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.5.7"; sha256="1y3iiw3grs6h3ppar1yjmha0nbp19naiirj0hvzgi4yhnibf7nid"; depends=[bookdown knitr magick xaringan]; };
   boostmtree = derive2 { name="boostmtree"; version="1.4.1"; sha256="16adb9akrdw1cfcarrv9l5cxhn1nzskir6nwl9nawl1r727s57z6"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-  boot = derive2 { name="boot"; version="1.3-23"; sha256="0bx07zbb5nfz2xfgnzbspg7r5vxz4bjdz1ry4d1vk434vlcrxj1h"; depends=[]; };
+  boot = derive2 { name="boot"; version="1.3-24"; sha256="0yv0l55kjmlfdx1xhgyjdi0bskxhfal74wr5jxaib1qj99nmkm49"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
   bootImpute = derive2 { name="bootImpute"; version="1.0.0"; sha256="0y2iw1ryhl7zskv1glrfjg75y7r0wmll0ls4254digp3wykafll1"; depends=[mice smcfcs]; };
   bootLR = derive2 { name="bootLR"; version="1.0.2"; sha256="1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14"; depends=[binom boot]; };
@@ -5683,12 +5676,11 @@ in with self; {
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.5"; sha256="1mhw3val08l03y7c52kq6ln2l5gjn6x1mxg0hx7nr8b86skbrka4"; depends=[assertthat bit64 digest dplyr fs glue httpuv httr mime rio rlang stringr]; };
   bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; };
-  bpbounds = derive2 { name="bpbounds"; version="0.1.3"; sha256="1lqhrvd7hf8ryij5rf7zrcqc3k89bj1665x81m9rn7dixk7qlb6h"; depends=[]; };
+  bpbounds = derive2 { name="bpbounds"; version="0.1.4"; sha256="05knl0lmhbc399zwb35r8m1w5jvmwad8rg5m7m633pg7cfijayb9"; depends=[]; };
   bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; };
-  bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; };
+  bpcp = derive2 { name="bpcp"; version="1.4"; sha256="0jwz9vrz6ivz70qzgvpvksk94rw5m7vi6yijbg8dj6biq5rq01lv"; depends=[ggplot2 survival]; };
   bpgmm = derive2 { name="bpgmm"; version="1.0.5"; sha256="0dxyrcf1qyf3ymj36d9flaw8405m7c1cqxbv6yrqm2dhba0ymyxq"; depends=[gtools label_switching MASS mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; };
-  bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
-  bpnreg = derive2 { name="bpnreg"; version="1.0.1"; sha256="1nz3adhalhrr04yimsr6ybpw4hvl018sz3ynwcggpprpy92xwha9"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
+  bpnreg = derive2 { name="bpnreg"; version="1.0.2"; sha256="0lacfg4qdc3006f9ydxs9x50asdixm12s7ljwzm71a8phcqfimsv"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
   bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
   bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; };
   braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; };
@@ -5697,7 +5689,7 @@ in with self; {
   braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; };
   brainGraph = derive2 { name="brainGraph"; version="2.7.3"; sha256="1r39hxjix7vf3x8w46cgrpxfzsjkyw1k2r34xw73rvb75xx0aaay"; depends=[abind ade4 boot data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix oro_nifti permute RcppEigen scales]; };
   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]; };
+  brainR = derive2 { name="brainR"; version="1.6.0"; sha256="1l5rm6grslc6mivwh2fv3pznhy2cw16fz5695pmyfamzvsjggir1"; 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]; };
@@ -5715,22 +5707,23 @@ in with self; {
   brglm2 = derive2 { name="brglm2"; version="0.6.0"; sha256="1955fqnw97hn9r2q15a06xn80ijbrkfkxjihq91dfj82mb38fqyv"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; };
   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.7-2"; sha256="0kd4p5pz46vssjb8faxwy5nv6r403a89h8hylxhq50n2rj94x934"; depends=[Brobdingnag coda Matrix mvnfast scales stringr]; };
+  bridgesampling = derive2 { name="bridgesampling"; version="0.8-1"; sha256="1gjklf88yi6xw0idfm720bdmryhj7dxir211rfl6wk7jsiasxhlh"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
+  brinton = derive2 { name="brinton"; version="0.1.3"; sha256="0nirqv0r53873jk0g7ip0n5ll5qasm0jbj2rlk1c7mms5lad9lzy"; depends=[forcats ggplot2 gridExtra lubridate pander qpdf RColorBrewer rmarkdown sm tibble]; };
   briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; };
   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.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.10.0"; sha256="10v9givr91k316j5c26qddw0591i32p4arzspavsjhli2x2nyilh"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
-  brnn = derive2 { name="brnn"; version="0.7"; sha256="1bfqr21szlpn1izjwlzih9j7f34x31zrapckk184rvynbsbgg7g6"; depends=[Formula]; };
+  brms = derive2 { name="brms"; version="2.11.1"; sha256="1k3b8ax5d7d2m0b9h3hkivj3wfvp3rpq62v2caq1wnk9irxsciab"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
+  brnn = derive2 { name="brnn"; version="0.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; };
   broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.5.2"; sha256="0qmclih5dm5sqzy4hplcfy677kr12pm9pnpv3r319g14dd27pbqn"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; };
+  broom = derive2 { name="broom"; version="0.5.3"; sha256="177m249dxbf9pf249610qrl58v025ws41ipfihy66751pwsv2n8d"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; };
   broom_mixed = derive2 { name="broom.mixed"; version="0.2.4"; sha256="176817l4d31xbi7yfsjlw287va2wjllxizhi5z3p7x5mi7fkyv2c"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; };
-  broomExtra = derive2 { name="broomExtra"; version="0.0.6"; sha256="0wnis18nm11kkb198rqr8179mr9vfrb7hwn5v9dy2sqwbf47ncc6"; depends=[broom broom_mixed dplyr magrittr purrr rlang rsample tidyr]; };
+  broomExtra = derive2 { name="broomExtra"; version="1.0.1"; sha256="0jb3s4fzy2s0bnpp8dz1dp1lhnaag18bi7gay738i5bx8f558if8"; depends=[broom broom_mixed dplyr magrittr rlang]; };
   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.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; };
   brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; };
-  brunnermunzel = derive2 { name="brunnermunzel"; version="1.3.5"; sha256="0pam2a17vj62a8as7a9lhk29wpd0chan8g7rx296da481n5r5w6b"; depends=[]; };
+  brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; };
   bs4Dash = derive2 { name="bs4Dash"; version="0.5.0"; sha256="1y75i6bsdy1bsbzwjblsnimw1zzk0zl3qnzqfq9zcnf6q2ghi3r2"; 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.2"; sha256="1r7jmrj91na9718digggsjqfqc2l0s0md68vr3s9xcb77c4bbhyi"; depends=[ggplot2 gridExtra MASS]; };
@@ -5740,14 +5733,14 @@ in with self; {
   bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="0.1.8"; sha256="14bm80pzcq61ibhnz4b1r6g74dvl9psrqpd3jcgmb7lzj6w6p0xv"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="0.1.8-1"; sha256="1754n6cgfnq4q6b0yqbgrkgwnp2ia1pv5xnppqaij2m9gbycrznw"; 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-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; };
   bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[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.4"; sha256="17bjd1d2yj1l98mbflklznxd3q7zi5nzj943nxzva7ij3hdsn6l4"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; };
-  bucky = derive2 { name="bucky"; version="1.0.5"; sha256="0xn92dnhrs8810f8kvn2dnig0icd1k4dkxljmldij6dn8xb7c85q"; depends=[lmtest sandwich]; };
-  buildmer = derive2 { name="buildmer"; version="1.3"; sha256="0iv0819vaax7yy2p9cyrhj507n3zr681w7ks81y2b07n8mra0ylz"; depends=[lme4 mgcv plyr]; };
+  bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; };
+  buildmer = derive2 { name="buildmer"; version="1.4"; sha256="1g18kx525mb9hi8f4msrzqwxsgfxhzpc6yh2q4wn159ca3j0wgs7"; depends=[lme4 mgcv nlme plyr]; };
   bujar = derive2 { name="bujar"; version="0.2-7"; sha256="1r14mh5j2w87mc6b192hi4qg97si2xv6v826j6c1awh7w3vqbbr9"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; };
   bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; };
   bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; };
@@ -5760,61 +5753,62 @@ in with self; {
   burnr = derive2 { name="burnr"; version="0.5.0"; sha256="19kkk4cyd7h3idn8di77426lcmq2jkxaksbpvg87hpkn72vcr8y5"; depends=[ggplot2 MASS plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
   busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; };
-  butcher = derive2 { name="butcher"; version="0.1.0"; sha256="0rs7mkwq78bdlpvcy6l6wqcj9x3dfqqjy9p0mq0w6z82cakv5w8q"; depends=[fs lobstr purrr rlang tibble usethis]; };
+  butcher = derive2 { name="butcher"; version="0.1.1"; sha256="0ds4k5yj4i2dj3zd35xgsz9h3scsrirndggz7arjwgfax9cnwidh"; depends=[fs lobstr modeldata purrr rlang tibble usethis]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
   bvartools = derive2 { name="bvartools"; version="0.0.2"; sha256="16wa2bnm91764xspgvswvl3ylv0s3x5f734scw9x0zjy9q72b05h"; depends=[coda Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; };
   bwimage = derive2 { name="bwimage"; version="1.2"; sha256="1wm17spxfrgf8kfc6fadri54sdk0b9813s9y4rp2xiwmy5sp6aj2"; depends=[jpeg png]; };
+  bwsTools = derive2 { name="bwsTools"; version="1.0.1"; sha256="15pa0nxk3wksi11p1bs48cyaqxk0lxqvnwiwznw8f7bjkacnn1hl"; depends=[crossdes dplyr igraph magrittr rlang tidyr]; };
   bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; };
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
-  bzinb = derive2 { name="bzinb"; version="1.0.3"; sha256="1n5ga5v6v71cgrgga5jlhmxs0s62pz93lsp3x8qz6vg042m5dl0s"; depends=[BH Rcpp]; };
+  bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; };
   c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
-  c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.3"; sha256="1fnsaadnam8njj1gskz26j71jd3n229y61psk3scnbrr5fyawlhh"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; };
+  c14bazAAR = derive2 { name="c14bazAAR"; version="1.2.0"; sha256="0bgf7fa428zp55qnkzhgghrj4hyv2lkhzg8b6msbq3bz2bah7jlz"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; };
   c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; 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.8"; sha256="08616cbzwdl2yqjk2v9nlwzgky8fq16qpzahbay8sb9kjslqgiyg"; depends=[lme4 Matrix]; };
+  cAIC4 = derive2 { name="cAIC4"; version="0.9"; sha256="0imy4kq09an9azqi3aahw3lsmby8km2am0w7fb314xq6ghzf9xmp"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; };
   cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; };
   cNORM = derive2 { name="cNORM"; version="1.2.2"; sha256="1lid4j6i65xmmakab0bbs7vyhkrvax3l5kv7r66x665gm8y00h0b"; depends=[lattice latticeExtra leaps]; };
   cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; };
   cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; };
   cRegulome = derive2 { name="cRegulome"; version="0.3.1"; sha256="0j3rv7vakv27r1n1yxmd50nlnyc4y329w0dmrw56dwkdkk4zzbsg"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; };
+  cSEM = derive2 { name="cSEM"; version="0.1.0"; sha256="1vqqlajyvcwk0nd546kq03x14vi7iq9bs2mq2zlp571v7g5gmfi1"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; };
   ca = derive2 { name="ca"; version="0.71"; sha256="1ywqvj0rc9ss7yim4x09yf6l80xz4y6ggl56m0c1hc9x6wxna7h2"; depends=[]; };
-  caMST = derive2 { name="caMST"; version="0.1.2"; sha256="1prs9xrva3wk7d5k13a4vxgjdv5vw1ybymprp21v97h199qsnarp"; depends=[catR diagram mstR]; };
+  caMST = derive2 { name="caMST"; version="0.1.3"; sha256="1hhxyw7sbzm2v09xaxvq347gl8p5wkjxx43187mqbw0nzknlg5bg"; depends=[catR diagram mstR]; };
   caRamel = derive2 { name="caRamel"; version="1.1"; sha256="06nppjx66xwdqchna5j6xlhfzs5g36nv8srwivbnfixys29awabb"; 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.3"; sha256="04m7vbydxb1nipday97w29p2miykyzxw572j9lda6jxmmp2kb1yp"; depends=[bitops]; };
+  caTools = derive2 { name="caTools"; version="1.18.0"; sha256="0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3"; depends=[bitops]; };
   cabinets = derive2 { name="cabinets"; version="0.3.1"; sha256="1f6pkh2vpnqdqhbd6ipy5553xh7bppc7y7xbz9lw27wn5fppilzl"; depends=[crayon fs glue here purrr R6 rjson rstudioapi stringr usethis withr]; };
-  cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
+  cabootcrs = derive2 { name="cabootcrs"; version="2.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
   caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; };
   caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; };
   cairoDevice = derive2 { name="cairoDevice"; version="2.28"; sha256="14885gpmhdzmxbz3q59s5sd3kjkyi5yf9lpnjwmvc482n8ix4lpq"; depends=[]; };
   calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calcWOI = derive2 { name="calcWOI"; version="1.0.2"; sha256="09g96inaayp0brbxw75l7k1cqn50f7qw0glb2g04657zmlk16i52"; depends=[LS2W wavethresh]; };
-  calculus = derive2 { name="calculus"; version="0.1.1"; sha256="1haviqraiil5cx6sy2zlkxlspvv1vx6qn1jji77ma4yhd2xzs1gk"; depends=[Rcpp]; };
+  calculus = derive2 { name="calculus"; version="0.2.0"; sha256="0ks92pis7471p2qq66lysb3hw99qbm068v5gf82mknk56lfbymdc"; depends=[Rcpp]; };
   calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   calibrate = derive2 { name="calibrate"; version="1.7.5"; sha256="1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"; depends=[MASS]; };
   calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; };
   calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; };
-  callr = derive2 { name="callr"; version="3.3.2"; sha256="12dbqzjngbyaqdyw0yq1blyfx8pagcvx1vqj2jm451hs25nhdrnh"; depends=[processx R6]; };
+  callr = derive2 { name="callr"; version="3.4.0"; sha256="1hvxw2glizq8g0qnxakcxh8jc5scn0hp1x8i70fdpqwwbgx49slr"; depends=[processx R6]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
-  camtrapR = derive2 { name="camtrapR"; version="1.1"; sha256="1lmci62r6igz3yqlh59ca3p6msf8v2wn1wz5jh6mcdh5b8k50gas"; depends=[overlap rgdal ritis secr sp taxize]; };
+  camtrapR = derive2 { name="camtrapR"; version="1.2.3"; sha256="0sjniyi36ri0yz2bbhc0f8kwghz3wqcp1hi7sf2fx0y6hg33z6xn"; depends=[data_table overlap secr sp]; };
   cancensus = derive2 { name="cancensus"; version="0.2.0"; sha256="1vggqpv7l472dc889fh2ldsijgwpv9s6ai8jhqhz2q2xdg099v7c"; 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.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; };
   cansim = derive2 { name="cansim"; version="0.3.3"; sha256="17rhhqzs49zhgkhcdi4xq7cgj4hb6900bxvw43nbwqr3gcif1wpq"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="1.24.8"; sha256="1sxhxddl9fdvxs1hdn5b03jg0sp8wgpfli9v0p2n381lq1z30m3s"; depends=[htmlwidgets httr]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.26.5"; sha256="0bgba7sz1xd3r8l130m40p0wyiq5mvsww6n5lji3qkiqihzdd0ra"; depends=[htmlwidgets httr]; };
   cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; };
-  cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
   caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; };
   capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; };
   capm = derive2 { name="capm"; version="0.14.0"; sha256="0c3rnc1qd9c4v0jj8ihg6bdhpqvfnpafkqyqkar6fwnlvgw48z83"; depends=[circlize deSolve dplyr FME ggplot2 magrittr sf survey tidyr]; };
@@ -5823,41 +5817,41 @@ in with self; {
   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-5"; sha256="0w7fm81pn0wqrwzbjyddnrkpjl8gavg7ijh7rab9f21rkgkzgm3y"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
+  car = derive2 { name="car"; version="3.0-6"; sha256="0yv5mwaa0ymrbis9590mx0zcj3w6j4drhs6ab13zhx4zc3x1b7b6"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
   carData = derive2 { name="carData"; version="3.0-3"; sha256="0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq"; depends=[]; };
   carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
+  carat = derive2 { name="carat"; version="0.1.0"; sha256="09vqcljl74x6qbk88mf9xnp1hwzg1mwvmxi43gmw8qcg13zcfiai"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; };
   carbonate = derive2 { name="carbonate"; version="0.1.2"; sha256="1v4ssdk7j60sm4iahywb4x710ijvzj0yczcmr75zvq9rjfki1b54"; 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]; };
   care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
   careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; };
-  caret = derive2 { name="caret"; version="6.0-84"; sha256="03898irgb70q0p01kq99yb6q6xji0jx4jmj0yxlv8wcwd841r0x1"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
-  caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
-  carfima = derive2 { name="carfima"; version="2.0.1"; sha256="0nzwf4x59vfv5idfdcghizipjlg33v6d8scxm8rh7pxnfbc1jp56"; depends=[cubature DEoptim invgamma MASS numDeriv Rcpp RcppArmadillo Rdpack truncnorm]; };
+  caret = derive2 { name="caret"; version="6.0-85"; sha256="0jxbf2zcvbb5s2pnjzg182awjvylc57q7z5plx6gs6gm62zxjafs"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; };
+  caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.1"; sha256="127gqd23xjis62irqviihzk80zydrdplwh65zcmd7ng29ih5wnby"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
   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.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; };
   carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; };
   cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; };
-  cartogram = derive2 { name="cartogram"; version="0.1.1"; sha256="171zw3h38iyxy70wz7yqhnivjx6kf1srj97dfmlkxyhz1ppyk38w"; depends=[packcircles rgeos sf sp]; };
+  cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; };
   cartography = derive2 { name="cartography"; version="2.2.1"; sha256="0fbgaaq354j6hg7m9wgpw4z1b26njl4liysb2vzgi3py5n9xg3dp"; 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.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; };
-  cascsim = derive2 { name="cascsim"; version="0.3"; sha256="07v4lwnma3zpci0iw0nmjss95z3kzw8sgz5mi9nqwsgm25vzrl1y"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; };
-  caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
+  cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; };
+  caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; };
   casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; };
   casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; };
   cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; };
-  castor = derive2 { name="castor"; version="1.5.0"; sha256="1fdfprp03ddslypqkclnv4i9cbk92d4qiqy3qx8bnv8gly76n40s"; depends=[naturalsort nloptr Rcpp]; };
+  castor = derive2 { name="castor"; version="1.5.5"; sha256="1bsdyi905zafk8av0svw6ql0pg4ns1q7w810xx448k0hpq4v468l"; depends=[naturalsort nloptr Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   cat_dt = derive2 { name="cat.dt"; version="0.1.0"; sha256="1rxq1kaw03c7m2jz4n6v5x4l9fiaqahdrvh9624zapf9mfhky0lm"; depends=[Matrix Rglpk]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; };
-  catSurv = derive2 { name="catSurv"; version="1.1.3"; sha256="11j4girw99wj0l3b022kkgjcsww99dwpn3hpwzyxxd54cr55bbip"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; };
+  catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; };
-  catchr = derive2 { name="catchr"; version="0.2.1"; sha256="00h7gizv90zq78a80pqvp78f2l55xxnmya2g275pj84dqj1g9pfb"; depends=[purrr rlang]; };
+  catchr = derive2 { name="catchr"; version="0.2.2"; sha256="02swyg21wd6793nk590lis5bh36lb2mjvv1k05szf22k08vsqv77"; depends=[purrr rlang]; };
   catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; };
   catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
@@ -5869,23 +5863,24 @@ in with self; {
   catnet = derive2 { name="catnet"; version="1.15.5"; sha256="1mwhchja3k9mrhclg6janxsjjs4x20ppg3gx6jymfai2bdv23azh"; depends=[]; };
   catseyes = derive2 { name="catseyes"; version="0.2.3"; sha256="1p0jnjjfl1jqqqk8q6yfsxrh30idfbss7v6lrrm25x8zrhxah0ww"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-  cattonum = derive2 { name="cattonum"; version="0.0.2"; sha256="0flsfyiymg8p1wik6yldas0ai1bq973rhhh4s3dblf1il4fdl4bv"; depends=[dplyr tidyselect]; };
+  cattonum = derive2 { name="cattonum"; version="0.0.3"; sha256="03xshvf1yna9i0gbxx1ackq375890lvbkw6pp5zjs0fyidg0fmww"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; };
   causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
   causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
-  causalweight = derive2 { name="causalweight"; version="0.1.2"; sha256="0xl49r2dgcns3162b651bn9bbc4gr7cd97jbdwzg21bjzp6v4ic1"; depends=[mvtnorm np]; };
+  causalweight = derive2 { name="causalweight"; version="0.1.3"; sha256="0bg3xxnbixz2p5qrkziwf3jh6rpcp6c1fngv0vpq1y957j3fw5f2"; depends=[hdm LARF mvtnorm np]; };
   cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; 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]; };
   cbinom = derive2 { name="cbinom"; version="1.3"; sha256="0d9rsvs0zmm37pf1v9vbkkghi0pjlavzi5ar2cvsjapg9x4zg6wl"; depends=[Rcpp]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; };
+  cbq = derive2 { name="cbq"; version="0.1.0.0"; sha256="1h02pf0jb5qg1ww9phmm3m49ix2qgvk7kyyav6923vp1hn5y5hbj"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; };
   cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; };
   cbsodataR = derive2 { name="cbsodataR"; version="0.3.5"; sha256="1j0v360q5vwl4xqzd35glwilcz8hv6kh4kky19zkzckkj4qqzidi"; depends=[jsonlite whisker]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
   ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; };
-  ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
+  ccaPP = derive2 { name="ccaPP"; version="0.3.3"; sha256="1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
   ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; };
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
   cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
@@ -5900,20 +5895,20 @@ in with self; {
   ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; };
   ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; };
   cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="1.1.3"; sha256="15ql0w90n0y3jy21vkpdkqhiq3rf2hwz16l39hg3kpvnvn65k23r"; depends=[rqdatatable rquery wrapr]; };
+  cdata = derive2 { name="cdata"; version="1.1.5"; sha256="1ls1hc455j48rv7l5nh4dqpi27r4gnm65w7yd70m226h0ch6hsjb"; depends=[rqdatatable rquery wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; };
   cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; };
-  cder = derive2 { name="cder"; version="0.2-0"; sha256="0ajr99m7gdwzyxavn192y9isf3zpn4vpa3nzkn664clsmd5m7rny"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; };
+  cder = derive2 { name="cder"; version="0.2-1"; sha256="15gm2869dgnvwmdl6zbqb3aa2ngmnqmkjz6hapff1s09y3vwhq52"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; };
   cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; };
   cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
   cdparcoord = derive2 { name="cdparcoord"; version="1.0.1"; sha256="0ym2ypw4bsvmx9q4vskrq4pdd92y47vs8pay8san40rgzwqr2agb"; depends=[data_table freqparcoord partools plotly]; };
   cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; };
   ceRtainty = derive2 { name="ceRtainty"; version="1.0.0"; sha256="01wgvjpxqwhgh6vx9vbmiv4d88bps790l6ij3gw5w69hbrrd9ixi"; depends=[dplyr RColorBrewer tidyr]; };
-  cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
   cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
+  ced = derive2 { name="ced"; version="1.0.1"; sha256="0xrf3y1cr4dylhh2xr1gggnwdwn7riz37g6yw55hyryg03hxkms6"; depends=[Rcpp]; };
   ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; };
   celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; };
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
@@ -5923,7 +5918,7 @@ in with self; {
   cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; };
   censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; };
   censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
-  censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; };
+  censReg = derive2 { name="censReg"; version="0.5-30"; sha256="1zpbswyl1l7z4rfb1rws66g5vf150vj4d1y54681lvvbawhlnym3"; depends=[glmmML maxLik miscTools plm sandwich]; };
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
   censusapi = derive2 { name="censusapi"; version="0.6.0"; sha256="03h1np7v539mgnxlmwp1d5jv3nlm2fsylw53hqxd736q3h2rjz0s"; depends=[httr jsonlite]; };
@@ -5932,6 +5927,7 @@ in with self; {
   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]; };
   centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; };
+  centrifugeR = derive2 { name="centrifugeR"; version="0.1.3"; sha256="00sdyj7p2dawnp7nbpnpxqzavfr5gbvrbvvqkldm187iclw6bci8"; depends=[pracma]; };
   cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
   cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; };
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
@@ -5950,7 +5946,7 @@ in with self; {
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
   cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cglasso = derive2 { name="cglasso"; version="1.1.1"; sha256="0d3r6jxrh1z4qnpxcfvwd7bcayzya2dhfl3hpfqd2dzm8fwwc2lf"; depends=[igraph MASS]; };
-  cglm = derive2 { name="cglm"; version="1.0"; sha256="1539n1q1zz1888d143w6vva9465viwcnb49frcsb74j3zvk6j4zp"; depends=[data_table nleqslv Rcpp RcppArmadillo]; };
+  cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; };
   cgmanalysis = derive2 { name="cgmanalysis"; version="2.5"; sha256="0mpdd56zhvdlwl305752ivmabmlqb2pkayqrscraq7kshb3fm8cr"; depends=[ggplot2 lubridate pastecs pracma readr readxl zoo]; };
   cgraph = derive2 { name="cgraph"; version="5.0.1"; sha256="14x0q2353kfd66788amxydayqigrhfgdkf9i6rcliwc0cx9hqcck"; depends=[]; };
   cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; };
@@ -5965,18 +5961,18 @@ in with self; {
   charlatan = derive2 { name="charlatan"; version="0.3.0"; sha256="1i8n6kmdv8f2mnd626qja979qx35fdl1a8r9akgqznh5bhjqiq42"; depends=[R6 tibble whisker]; };
   chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; };
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
-  chebpol = derive2 { name="chebpol"; version="2.1-1"; sha256="0zjw1fz9ql8zpv61qwhqkhdigqrk729hp8hhpbnwif57wv3lfvnx"; depends=[geometry]; };
+  chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; 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.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.4.7"; sha256="009dih2cp696fddbxy634gc1y94hn3irhi13dbjdmr0s1vi38596"; depends=[]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.8"; sha256="0j5z6kmpfns8i28bkdbmwcmbv8cxmfws9d57kv3g1g3km2fmiwcl"; depends=[]; };
   checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; };
-  cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; };
   cheese = derive2 { name="cheese"; version="0.0.1"; sha256="0yjb68qlz62vmvjf6c8qfblihkkigfbhxpw42mm6qdy4f483mpr2"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   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-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; };
+  chest = derive2 { name="chest"; version="0.2.0"; sha256="1p5ggkx73k1ji40y94sbihwh05lbwy6pb060nf3spx0vfs0y8q4m"; depends=[broom forestplot MASS scales speedglm survival tibble tidyselect tidyverse]; };
   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.1"; sha256="1d2rvaxdcambawf8l4sn566nr3s8xgf8nfpqa5n6lazvik8vb7kb"; depends=[data_table doParallel foreach gamlss gamlss_tr iterators MASS]; };
@@ -5987,7 +5983,7 @@ in with self; {
   chinese_misc = derive2 { name="chinese.misc"; version="0.2.1"; sha256="17sffxjpga8mq8xfxhas9jqj71bb80ayz4m2dgnmg1w6bb3p7bsp"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
   chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; };
-  chk = derive2 { name="chk"; version="0.2.1"; sha256="09bs1q3x6393rk91l6491pbjs4wyn63n7i8lzpg2jxjl25c2xa3y"; depends=[lifecycle rlang]; };
+  chk = derive2 { name="chk"; version="0.3.0"; sha256="1s819nkcyfipa2fz684850xv4hh6x4iph6dyxd6xrfxx7mi5vvw8"; depends=[lifecycle rlang]; };
   chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.1.2"; sha256="0zg3xjq67na98n4amsm5v4cn9ba1k7c0lb7k2lvxa3n1w7rndpw3"; depends=[]; };
   chngpt = derive2 { name="chngpt"; version="2019.11-30"; sha256="1yw6hsshpsavmx3v1ndh4b0crr8wsak8h1vbv5qrbj3g1jzazrx7"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
@@ -5999,10 +5995,12 @@ in with self; {
   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.9.2"; sha256="0g999i5nlxhbjcnx3kfv4qzd16ybj0da5bwkkn0bsb9qbp8s7lll"; depends=[dplyr forcats magrittr purrr stringr XML zoo]; };
+  christmas = derive2 { name="christmas"; version="1.0.0"; sha256="06a2r56vh7m6j0kfbf3b3aapn52x693fzdn29sxfvyackdk5dhj3"; depends=[animation]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-54"; sha256="0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd"; depends=[]; };
+  chronosphere = derive2 { name="chronosphere"; version="0.2.0"; sha256="0c1qahgjnnncckyizdrpsxywq5120xflv9cgwdwhypgda3r05kql"; depends=[raster sp]; };
   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.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; };
@@ -6014,10 +6012,11 @@ in with self; {
   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.8"; sha256="0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
+  circumplex = derive2 { name="circumplex"; version="0.3.5"; sha256="1qbh1piwbbwri3m3b00n4rlicmihfivsqq7gh02vqw01fckg60sl"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-  citecorp = derive2 { name="citecorp"; version="0.2.0"; sha256="1lkbfklmwp84408pbpr8n63r4kqrw3z36mzmhramxnscrsf3f8k6"; depends=[crul data_table fauxpas jsonlite]; };
+  citecorp = derive2 { name="citecorp"; version="0.2.2"; sha256="1a5hw9xaa84n847rb8a317svhya1dpfbb79sabaw6m6db4nagm6z"; depends=[crul data_table fauxpas jsonlite]; };
   citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; };
   ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; };
   civis = derive2 { name="civis"; version="2.1.0"; sha256="0bpm42q243ghq03x9vajs0yjdhy4lgn7fqndc53172inmkxwp7dy"; depends=[future httr jsonlite memoise]; };
@@ -6040,29 +6039,29 @@ in with self; {
   clean = derive2 { name="clean"; version="1.1.0"; sha256="11jfg9xh6xyhcva4pq5bl7bg2d2ar12mp568j8j79dqlci3f53zx"; depends=[crayon knitr pillar rlang]; };
   cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
   cleanNLP = derive2 { name="cleanNLP"; version="3.0.0"; sha256="15prwj32rq28dqqpfagaq4vfbimjws7ldrjm7waf4w6rcavz7r93"; depends=[Matrix reticulate stringi udpipe]; };
-  cleancall = derive2 { name="cleancall"; version="0.1.0"; sha256="0g52nvr8fnwlhfzx0ja87xkg4ff3jafj08qz9xkwc790zfszc6z1"; depends=[]; };
+  cleancall = derive2 { name="cleancall"; version="0.1.1"; sha256="1gq7bjywgslybfk97k3fxglp6j78a0cklaammccvffs3b94i4zh4"; depends=[]; };
   cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; };
   cleaner = derive2 { name="cleaner"; version="1.2.0"; sha256="0n8qxvy8xixdgibh17fsl5vf1nvfj0l0804crdjq3lhr5s3b794f"; depends=[crayon knitr pillar rlang]; };
   cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; };
-  cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; };
-  cleanr = derive2 { name="cleanr"; version="1.2.0"; sha256="1yd6w4jv4rj1g67i3q7h0z2n8nycvg67ixxgf49fplxnjhxq09g5"; depends=[checkmate pkgload rprojroot]; };
+  cleangeo = derive2 { name="cleangeo"; version="0.2-3"; sha256="02py25pir16yklffpdicljxhwdf7bqchqllgdk069f5gikfc8yrr"; depends=[maptools rgeos sp]; };
+  cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; };
   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.7-2"; sha256="093hqqbmwbrcggqjcz4yiaavvwpv6xi12nc50ca9sg5ajlg4xg65"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
-  cli = derive2 { name="cli"; version="1.1.0"; sha256="02hdwvdq5nic6dhxj88jbgsc9m8yrz3yibigg6szkggxyk6hzh2g"; depends=[assertthat crayon]; };
+  cli = derive2 { name="cli"; version="2.0.1"; sha256="0x28i7kj4qndk6mnn99qn9w2nfldv8csjnsn0n8phfnxq5hnmp5y"; depends=[assertthat crayon fansi glue]; };
   cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; };
-  clickR = derive2 { name="clickR"; version="0.4.32"; sha256="1x86qfhaxdqm7vwkynr57qg3r86s4yf1v20cjs3lskbwggsq49jv"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
+  clickR = derive2 { name="clickR"; version="0.4.40"; sha256="1wwipqg5d158f4j26bvz2ig2wrcnlxqc713pxnnfml0nmrvnx41w"; 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.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
+  climate = derive2 { name="climate"; version="0.3.0"; sha256="1pabgfx25rza823jrbmk6x2yzv3s7y3zwgiags34z62h9m51772a"; depends=[imgw RCurl XML]; };
   climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; };
   climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; };
   climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; };
-  climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-9.1"; sha256="13wjkz2ldpvw9ri58vqpzdrqqyvzygmhzshx10v25d757x6h1qvb"; depends=[PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
   climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; };
   climwin = derive2 { name="climwin"; version="1.2.2"; sha256="02kc8zvmygy9vbcx6lmxz2pyiz0sii3l35m869zr3a8hi9rx000x"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; };
-  clinDR = derive2 { name="clinDR"; version="1.9"; sha256="1s5j0rr164cw8ijxlpxcw8dj1zyqyvr83w2g7mj681gffmlcalld"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
+  clinDR = derive2 { name="clinDR"; version="2.2.1"; sha256="02l0k2kl3g9nq072ljiw8dfrrxpsrk7kb5drxb830jy8jdvys3hv"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
   clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; };
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
   clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
@@ -6080,9 +6079,9 @@ in with self; {
   clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; };
   clrdag = derive2 { name="clrdag"; version="0.6.0"; sha256="1py5x1783c9d83hgar3g70qgbsakgs6n5ckpx87fiw32l040abwa"; depends=[Rcpp RcppArmadillo]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clubSandwich = derive2 { name="clubSandwich"; version="0.3.5"; sha256="03mxfvh2h4gigis7wzq9hwzfaanpx66h1c16xx11pqfkvdfwal49"; depends=[sandwich]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.4.0"; sha256="1kz68vmfahsszxkck3c59qi35sr7987ym0znp07h3smrw1r85xcd"; depends=[sandwich]; };
   clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; };
-  clues = derive2 { name="clues"; version="0.6.1"; sha256="1g7qy9fxdjmc3y7x0qpa9prn5l83l3j59dzs862f35k7mzfnyggj"; depends=[]; };
+  clues = derive2 { name="clues"; version="0.6.2.2"; sha256="1pvalkpvxjj6qrvffbx0sqvfmcxf6dkzrpklshkx1b2k5s4z8791"; depends=[]; };
   cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; };
   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=[]; };
@@ -6100,13 +6099,15 @@ in with self; {
   clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; };
   clusterSEs = derive2 { name="clusterSEs"; version="2.6.2"; sha256="15a9hn8g70y64v5lq91mwjbx411ji2b5zvm1wm4qz820jri5wy20"; depends=[AER Formula lmtest mlogit plm sandwich]; };
-  clusterSim = derive2 { name="clusterSim"; version="0.48-2"; sha256="0y1y09y7dmk8kfnzhmywxbjcxg4qkawjsqxvpfkz9rqw0q2hchya"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
+  clusterSim = derive2 { name="clusterSim"; version="0.48-3"; sha256="1037d9nwj214vgmva6590kvyqr19brbnmb36inkgph4mg3276lsf"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
+  clusterability = derive2 { name="clusterability"; version="0.1.0.0"; sha256="1zc6b8j4vq1dz7f15x7ip2qwh56srj0wk1pkjwjca0ddlagaj72z"; depends=[diptest]; };
   clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.1"; sha256="01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n"; 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.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; };
-  clustermq = derive2 { name="clustermq"; version="0.8.8"; sha256="0znyfrsnzrvizpazk8630szln3gxqm5c47x1z1749bqciy39g25m"; depends=[narray progress purrr R6 rzmq]; };
+  clustermole = derive2 { name="clustermole"; version="1.0.0"; sha256="05sip8zis5i0sin9fsz39yin06154si63h45sp5pkzb0qwacyqbr"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; };
+  clustermq = derive2 { name="clustermq"; version="0.8.8.1"; sha256="1xx2dq3rhyxq3qzgr6gh1yh2qli0s5hrvn096ak18z6ydzyn2g0z"; depends=[narray progress purrr R6 rzmq]; };
   clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clusternor = derive2 { name="clusternor"; version="0.0-3"; sha256="0qf1k5y9i60skdqz7glq7czwg84gafnxfg0npx772xydvivan210"; depends=[Rcpp]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
@@ -6125,34 +6126,34 @@ in with self; {
   cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; };
   cmna = derive2 { name="cmna"; version="1.0.2"; sha256="18vbqa258m0g5pvfhqi2vbr8n2bil07n9spgz1wh2axw1c3bcf76"; depends=[]; };
   cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; };
-  cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; };
+  cmpprocess = derive2 { name="cmpprocess"; version="1.1"; sha256="03r0sfkf955w59dixya5agff0xdlwmxrlwvik7716l1alydcl4vl"; depends=[compoisson numDeriv]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-9"; sha256="0xhgfg5b4i9skkaxp7gzkafgg5bqs5q1rp4hpw2jjmykg2nifn99"; depends=[survival]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; };
   cmsaf = derive2 { name="cmsaf"; version="2.0.1"; sha256="0ampq493i8x40jk8p8acgizy1vlhm05i5nllk5a0xk81vywf7ifi"; depends=[fields FNN ncdf4 rainfarmr raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-6"; sha256="1wf23w9gxrrgw7j740r381xrss09inzd7mrg6g7wz883c9madbfn"; depends=[elliptic emulator]; };
-  cna = derive2 { name="cna"; version="2.2.1"; sha256="1yzr3r8jykr25i52f5rvq9h68gnkqksy9qkkmib771kmdy1k310a"; depends=[matrixStats Rcpp]; };
-  cnaOpt = derive2 { name="cnaOpt"; version="0.1.0"; sha256="1km2v3gkjzy2lib6b39fz9z733wdnkzlxhg12a58sd93wisg68h2"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; };
+  cna = derive2 { name="cna"; version="2.2.2"; sha256="1125fnw0a4phwpf6c64p7s2jf0g3p4hqwmgbp44dn5n71mhjd61z"; depends=[matrixStats Rcpp]; };
+  cnaOpt = derive2 { name="cnaOpt"; version="0.1.1"; sha256="179ixxl7lp446ps6nlslnnywxh2yba9ypx2zrya505k1ybryxhc2"; depends=[cna dplyr ggplot2 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.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; depends=[]; };
-  coala = derive2 { name="coala"; version="0.5.3"; sha256="02gfw20lhwdz9mbdwgla6kcvi84sjy916vxb9zwdgair493z3cay"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
+  coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; 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.10"; sha256="1yfibzkg4psmghfwpv5rivaxzizilbd8frgpd0z05hx519lmx9h7"; depends=[checkmate dplyr forcats ggplot2 gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
-  coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-4"; sha256="1y6msvcr1j9cvnc1v87p6wkwvnn7iszwsr9sl6ixjjwgnpc05ayc"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="3.9.0"; sha256="173chz93cwzxgh8lnvlvl9bzsd4plqrqxh6bwr6xkj11m5xmc7by"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; };
+  coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; };
+  cobalt = derive2 { name="cobalt"; version="4.0.0"; sha256="14g5a0j3lcd61igsi2phhfpcfxwgiq7jlakr9nr4yb5h345zwvx7"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; };
   cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
   cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes 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.4-0"; sha256="1z9wiqqx1jzmyfvmiag49vqf4cq6ayrwsv52h6jvnr9hgwnzrrzv"; depends=[vegan]; };
+  cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
   coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; };
   coda_base = derive2 { name="coda.base"; version="0.2.1"; sha256="1ammzzh4w8g5d6c1wfqg7pglrc5lq8sr3qzgf1bjsrm9p5ysw1li"; depends=[MASS Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codebook = derive2 { name="codebook"; version="0.8.1"; sha256="0rsrw5333wrmkqqgqbf7b7y91sjw7jyrzdsiaxa2y993s0nl4y2j"; depends=[dplyr DT future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr userfriendlyscience]; };
+  codebook = derive2 { name="codebook"; version="0.8.2"; sha256="1glzrvffhrgya6617m8zgbf2r8v1y1wpml11ayanz4s4k2xzzlmc"; depends=[dplyr DT forcats future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr tidyselect userfriendlyscience]; };
   codemetar = derive2 { name="codemetar"; version="0.1.8"; sha256="1zqpxh0hx7jh1xki1sx9bs5a30hv4gfaqqlnd630a5n68hghjmg2"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pingr pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; };
   codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; };
@@ -6169,9 +6170,10 @@ in with self; {
   coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; };
   cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; };
   cohorttools = derive2 { name="cohorttools"; version="0.1.0"; sha256="0350q0dyy0rfk2g8anc62cib2gq7hi4zzg3gsd02fhwadz5gnjga"; depends=[DiagrammeR DiagrammeRsvg Epi epitools rsvg survival]; };
-  coil = derive2 { name="coil"; version="1.0.1"; sha256="1hlyaqq253rxbng6ji1z64ld52bpxkcwb0g6709nvai297wixxyl"; depends=[ape aphid seqinr]; };
+  coil = derive2 { name="coil"; version="1.1.0"; sha256="1b73r51vyw4cb4ck3xvig0nhjf3hglg58s4kc1b28zzqzl7ay78k"; depends=[ape aphid seqinr]; };
   coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; };
   coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; };
+  coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3"; sha256="149ilps378rvk4g3icasb843d90vmx69kfdcl6a8828v1mg0pcvs"; depends=[cli crayon curl data_table ggplot2 jsonlite]; };
   cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; };
   cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; };
   cold = derive2 { name="cold"; version="2.0-0"; sha256="10kn2kycyc6di30ji6lk5agsczh1zdv65s8ryj6q2f40v0y0zlck"; depends=[cubature]; };
@@ -6187,9 +6189,8 @@ in with self; {
   coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; };
   colocalization = derive2 { name="colocalization"; version="1.0.1"; sha256="0ax560r5f629zv8rfa91ynx8g3kcn5ga553k5svircl21n65zb1y"; depends=[ggplot2]; };
   colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; };
-  colocr = derive2 { name="colocr"; version="0.1.0"; sha256="0lfwhn3hd7kwhm6dwbpfqhsphz2249vb0mpjvma18zym93x6gj2i"; depends=[imager magick magrittr scales shiny]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
-  colorSpec = derive2 { name="colorSpec"; version="1.0-1"; sha256="1fgikg5x9ir2n7nhjvsflnz99g2wjh3jj1yh59jiirq725dw573d"; depends=[MASS spacesXYZ]; };
+  colorSpec = derive2 { name="colorSpec"; version="1.1-1"; sha256="0c1da94abjq439h7y2rylidp9lnh6i2wc7m27cawkr983jpxcq0m"; depends=[MASS spacesXYZ]; };
   colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
   colorednoise = derive2 { name="colorednoise"; version="1.0.5"; sha256="094iil7f8w5cinw5j1ja3a2l1w352hlj6f3vfsvs6k1ww5f1sd6l"; depends=[dplyr purrr Rcpp RcppArmadillo tibble tidyr]; };
@@ -6219,22 +6220,21 @@ in with self; {
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
   commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.2.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; };
-  comorbidity = derive2 { name="comorbidity"; version="0.5.2"; sha256="0kf1fxv5aqkwy7q0df6f29jgjry3zliahgrs11rfmym5dhrb8rvm"; depends=[checkmate data_table]; };
+  comorbidity = derive2 { name="comorbidity"; version="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; };
   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.8.0"; sha256="199yd4qd6w07bd2hjfpkva9qzmq3f03arjgia9md56rwi7kp2bv8"; depends=[dplyr htmlTable magrittr stringr tidyr]; };
+  compareDF = derive2 { name="compareDF"; version="2.0.0"; sha256="1h93kh2bzy94ylghwixwhg8s6issz94ya0358xff3v9f6nlwh7k6"; depends=[dplyr htmlTable magrittr openxlsx stringr tidyr]; };
   compareGroups = derive2 { name="compareGroups"; version="4.2.0"; sha256="0lq5yd6d1vz8lzy1lnfav2726g3xdfxlbza055g0paxbxzxgs2n0"; depends=[chron epitools flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
-  comparer = derive2 { name="comparer"; version="0.2.0"; sha256="1m5kwk0zqqn07f81z4fpl0yfkpfkvg2hjpp4cim0jdnz08cm0wnq"; depends=[R6]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
   compas = derive2 { name="compas"; version="0.1"; sha256="1ckryllwd8avz6456970qhfa3wpcsmhkicnibnv7gl4crzf44xgx"; depends=[bio3d Rcpp RcppEigen]; };
   compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; };
   compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
   comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; };
-  comperes = derive2 { name="comperes"; version="0.2.2"; sha256="1kybykamzzgx00l758304n4m4q02cssqmq14cf93rlzy23348sw5"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  comperes = derive2 { name="comperes"; version="0.2.3"; sha256="1mz8002zqyyzdd2ija0iqc1fm10px6ll0bsl3pmfwwdqbqx17rmz"; depends=[dplyr magrittr rlang tibble tidyr]; };
   competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.2"; sha256="1k45y7zcckvpcx4pdin9zlsx1vrqlqx9lz67cbsawb254wbylc4l"; depends=[antitrust ggplot2 rhandsontable shiny trade]; };
   completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; };
   complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
@@ -6248,14 +6248,14 @@ in with self; {
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
   comtradr = derive2 { name="comtradr"; version="0.2.2"; sha256="177gnmgwqns65z5y9nw4xp8qmw5z70454zb54jw1879xrgfsrciz"; depends=[httr jsonlite magrittr purrr]; };
   con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; };
-  conStruct = derive2 { name="conStruct"; version="1.0.3"; sha256="044303ljm3b1g330kajr8r65ghfb9kni5ww4iyi0bba4m4rw2jdl"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; 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=[]; };
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
   concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; };
   concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; };
-  concurve = derive2 { name="concurve"; version="2.1.0"; sha256="17kf5fl90a28rm2cnkjz0cp572xam63yq1j4p3r556gp0nf8553p"; depends=[dplyr ggplot2 metafor scales survival survminer tibble]; };
+  concurve = derive2 { name="concurve"; version="2.3.0"; sha256="1bjdlr3hpnv69g5jg2y18zkly0al3g9qj8cq0dlpk7x6930imqx7"; depends=[bcaboot boot dplyr flextable ggplot2 knitr MASS metafor officer pbmcapply ProfileLikelihood rlang scales survival survminer tibble tidyr]; };
   cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; };
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
@@ -6267,7 +6267,7 @@ in with self; {
   condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; };
   condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; };
   coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; };
-  conf = derive2 { name="conf"; version="1.6.1"; sha256="07fhdk5ccak3pv3rf0ail46v822m8ycq8la1qivhl6jzi7ga45x9"; depends=[fitdistrplus SDMTools STAR statmod]; };
+  conf = derive2 { name="conf"; version="1.6.2"; sha256="0q5cs0m2r0pickx2w27nq01rshfzfrxj95lxic1r2lyblf06hqgz"; depends=[fitdistrplus pracma 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]; };
@@ -6279,10 +6279,11 @@ in with self; {
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
   confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; };
   confreq = derive2 { name="confreq"; version="1.5.4-3"; sha256="1jn9v9z04a2yni4l3i7969kzzpgaxkdfdggi74dgp3jchda6vip7"; depends=[gmp]; };
-  congressbr = derive2 { name="congressbr"; version="0.2.1"; sha256="1vfjyg05ssk7cnhy71cqvx38h65yrp0mm4fp6lh2q7bzh1lx69ad"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; };
+  congressbr = derive2 { name="congressbr"; version="0.2.2"; sha256="1br6bhfy0i0ashz9dpv63ag2d4yqvpl7ml82hsf15gjq6mwvr1nr"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; };
+  conjurer = derive2 { name="conjurer"; version="1.0.0"; sha256="0mhdl6wwvdjgal0qagyqlfs7fa0fnm24hg452dmszy85crk832dm"; depends=[]; };
   connections = derive2 { name="connections"; version="0.1.0"; sha256="1jkk9s3w6d3751hb2y4d2lilndhpfs2alqgg6k23q7bav6848wyp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; };
   conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; };
   conquestr = derive2 { name="conquestr"; version="0.3.7"; sha256="13pkbgw0z2icpc2l16g1wy92bbhmrk3l0jfhvh0sa8zj5idw35z1"; depends=[]; };
@@ -6341,7 +6342,7 @@ in with self; {
   corpustools = derive2 { name="corpustools"; version="0.4.1"; sha256="1zg7vx9j678zj4hmmi03pyf91y7dxx5297ks6gk00b3521z7hybh"; depends=[data_table digest Matrix R6 Rcpp RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; };
   corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; };
   corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
-  corrcoverage = derive2 { name="corrcoverage"; version="1.1.0"; sha256="194fb6j8pngqwnsndjld8709hj1637mswbx7ck6m3334f196af59"; depends=[magrittr matrixStats Rcpp]; };
+  corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; };
   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]; };
   correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; };
@@ -6368,7 +6369,7 @@ in with self; {
   countTransformers = derive2 { name="countTransformers"; version="0.0.6"; sha256="14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf"; depends=[Biobase limma MASS]; };
   countcolors = derive2 { name="countcolors"; version="0.9.1"; sha256="1gnwmw3inh8asbk6qba34vzx1k2cnh4m9d1346gxhzhlxvl6xiza"; depends=[colordistance jpeg png]; };
   countfitteR = derive2 { name="countfitteR"; version="1.0"; sha256="1kb7na35xk257a6bd9ihgbn13ygn5s553s9nph0hg7iw5nikknap"; depends=[ggplot2 MASS shiny]; };
-  countgmifs = derive2 { name="countgmifs"; version="0.0.1"; sha256="19d8xr7ipqp16w46c3mrg15jfcvpj7n4pds8zw6mgw4g81bcxamf"; depends=[MASS]; };
+  countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; 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]; };
@@ -6382,22 +6383,23 @@ in with self; {
   coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.4"; sha256="0lx42f86w5z7i0p2z5kwrm8rbcm4vriaagfhpixc8n7aq6mkb7bl"; depends=[colourpicker dplyr egg ggplot2 ggstance markdown shiny shinyjs tidyr]; };
   covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; };
   covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; };
+  covglasso = derive2 { name="covglasso"; version="1.0"; sha256="1i5k61jivmipzpk53hpab9vnc57rnyl24jy503lnk5r1plb9w93i"; depends=[Rcpp RcppArmadillo]; };
   covr = derive2 { name="covr"; version="3.4.0"; sha256="0p44kr6yz5sqza5zvq6divqglzkpv0if9pjpjmzhmdaaddjrqzg5"; depends=[crayon digest httr jsonlite rex withr yaml]; };
   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="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; };
   cowsay = derive2 { name="cowsay"; version="0.7.0"; sha256="1f5hc1sj79yd3l2c6vrcj6xx2hdfxb16c3d2sgr7yps8j5fyrb9h"; depends=[crayon fortunes rmsfact]; };
-  coxed = derive2 { name="coxed"; version="0.3.0"; sha256="01fwkw6ba8zj09a7mzm7rja188rapd6knwjq247pm4panqih8m5l"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
+  coxed = derive2 { name="coxed"; version="0.3.2"; sha256="1pj0w7a40zmnsmvlqi8kxa4psyijqwwjyjmvcvbs9xylqlwna6ih"; 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-14"; sha256="0pcmf44c3v1hvr8031lwgib58j6la5hsphsbc57mcgz09ppw30zg"; depends=[bdsmatrix Matrix nlme survival]; };
+  coxme = derive2 { name="coxme"; version="2.2-16"; sha256="04aid8v0y2afwwbfm39np1pgdla4jw427gy2wazsphf495b4pkm0"; depends=[bdsmatrix Matrix nlme survival]; };
   coxmeg = derive2 { name="coxmeg"; version="1.0.9"; sha256="19p2j6i34jg6akfyr6hv2xmashpsvf8y5bbql6a62b3f5yz5639v"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
   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.2"; sha256="0sj99jfnbd20k81pax3f614z0kafmvmglkykh10nadyc0g2sv5mm"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; };
+  coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; 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.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; };
   cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
@@ -6409,10 +6411,10 @@ in with self; {
   cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   cplots = derive2 { name="cplots"; version="0.4-0"; sha256="1k4kazw7lw2d991brnzhma6qvg8kwslrbi9q4gy61x02wcig927n"; depends=[circular]; };
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
-  cppRouting = derive2 { name="cppRouting"; version="1.2"; sha256="14h23wk7r3xr34mscp4dgc6i2vj4n810wgb4186qfym43rwzq5r2"; depends=[Rcpp]; };
+  cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; };
-  cpsurvsim = derive2 { name="cpsurvsim"; version="1.1.0"; sha256="1ywxzn20nx13yq9570farivfqn8i9ap6hz5szy2xm6g6pf2i8p4z"; depends=[Hmisc knitr plyr]; };
+  cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; };
   cpt = derive2 { name="cpt"; version="1.0.2"; sha256="0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7"; depends=[glmnet MASS nnet randomForest]; };
   cptcity = derive2 { name="cptcity"; version="1.0.4"; sha256="1agknys80m16xq0x285sdf1452a6dmghysrhy7s6zfcb59acb1nf"; depends=[]; };
   cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; };
@@ -6432,7 +6434,6 @@ in with self; {
   crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; };
   crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; };
   credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; };
-  creditmodel = derive2 { name="creditmodel"; version="1.1.6"; sha256="185pwcs50ssn24lm63waaq8pbyran11q848wwd9pphlminfw9wy4"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; };
   credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; 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]; };
@@ -6458,10 +6459,11 @@ in with self; {
   crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; };
   crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; };
   crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
-  crosswalkr = derive2 { name="crosswalkr"; version="0.2.5"; sha256="1bzfcvyknbds64f31d8azl2s0spsrja9abmk5lnyvwr1v76hggwb"; depends=[haven labelled readr readxl tibble]; };
+  crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; };
   crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; };
   crov = derive2 { name="crov"; version="0.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; };
   crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
+  crplyr = derive2 { name="crplyr"; version="0.3.3"; sha256="0jkh4jq0pwz1pqgckdylcdjg7d45z0xl3pdvyb93pcvi073na9na"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; };
   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]; };
@@ -6478,31 +6480,35 @@ in with self; {
   crunch = derive2 { name="crunch"; version="1.26.1"; sha256="01ajcvn31nb8cdmqmalmxvp1pvh7nmd9fyg2fc1zm7yy3a2klp9l"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.3.1"; sha256="1qvwzym2hj61zjlm7j34j8jl5kfpkpx35xfjjyl5y35a5y50sz8g"; depends=[crunch httpcache miniUI rstudioapi shiny]; };
   cruts = derive2 { name="cruts"; version="0.5"; sha256="08mklbmwgaq6cf3hd40mingplwjss5im30l5j6nmy7lijp15nq7k"; depends=[lubridate ncdf4 raster sp stringr]; };
-  crypto = derive2 { name="crypto"; version="1.1.2"; sha256="03cq0yg6110a4qfh0hzq7n6bclddkz1vbqjcjwn7v219nqamyrvm"; depends=[cli crayon curl dplyr httr jsonlite lubridate progress rstudioapi rvest tibble tidyr xml2 xts]; };
+  crypto = derive2 { name="crypto"; version="1.1.3"; sha256="0n8b5cp7fp65zp99i8mr6gxi4w0m0l9pyjzq572p2fd8pss1g5nr"; depends=[cli crayon curl dplyr httr jsonlite lubridate progress reshape2 rstudioapi rvest tibble tidyr xml2 xts]; };
   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]; };
   csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; };
   cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; };
   csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
+  csodata = derive2 { name="csodata"; version="0.1.5.0"; sha256="0qngazgky4nzcvz994652291dk2jizqykxjmqf0j3cv6wgsrhfrz"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; };
   csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
   csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
   cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; };
   cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; };
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
-  csv = derive2 { name="csv"; version="0.5.3"; sha256="0shc3g1lmnac5n3kgxj1xa2m6wv6wg5grbq0lm7clqh04k1cskb9"; depends=[]; };
+  csv = derive2 { name="csv"; version="0.5.4"; sha256="019hagmz68bg10x4ykbr67i5dx7277pxdsqlvq06fzlf47kgizm5"; depends=[]; };
   csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; };
   csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
-  ctl = derive2 { name="ctl"; version="1.0.0-2"; sha256="1gpb43zn411l476dby2g38qkcvh2fsdcvbkr9jb274l1154km1xm"; depends=[MASS qtl]; };
+  ctl = derive2 { name="ctl"; version="1.0.0-4"; sha256="027cij4vdsq3xhi38izzn07q6xwja7n8v95l7kk1pp92y9qkvqv3"; depends=[MASS qtl]; };
   ctmcd = derive2 { name="ctmcd"; version="1.4.1"; sha256="01nflgdyb70kh4f8bnxpavr31fz4fh02kgz2nlx3zzblnm2idbcx"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
   ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; };
-  ctmm = derive2 { name="ctmm"; version="0.5.7"; sha256="02i9k42raxy8ry1c4ydh96hfn1wvjp09yqppvlbhxbi56z9xj5ln"; depends=[data_table expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; };
+  ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; };
+  ctmm = derive2 { name="ctmm"; version="0.5.8"; sha256="17bqq67pwkkdmhv45n85w6y2n59vgaf5zhma2bhq1bn6dimgf1dq"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; };
   ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; };
+  ctrdata = derive2 { name="ctrdata"; version="1.2"; sha256="146nb5sv6mj43kqs8iz58nzyx4xrrk5khay2hjjpfrh1g076bw8k"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; };
   ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; };
-  ctsem = derive2 { name="ctsem"; version="3.0.8"; sha256="1wwv4abnjxsp62yz09l1jpkzxk41cb0g651lx849hmw8j12z03an"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  ctsem = derive2 { name="ctsem"; version="3.0.9"; sha256="0kkkyvmdz43npgh2xx4dsr0s02xj6x9d89rahqn2h0560qjd1059"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; };
   ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="2.0.3"; sha256="0wvs80i4axj7pdcy9gjl08qzjbcjkldha94xy4gdxc34vgmh7gvr"; depends=[Rcpp]; };
+  cuRe = derive2 { name="cuRe"; version="1.0.0"; sha256="0bdj3ak1s6rg84d82iy95g1sdanl6y5a4rdsnixqzrhb9kvnrv0s"; depends=[date numDeriv relsurv rootSolve rstpm2 statmod survival]; };
+  cubature = derive2 { name="cubature"; version="2.0.4"; sha256="0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r"; depends=[Rcpp]; };
   cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; };
   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]; };
@@ -6514,18 +6520,18 @@ in with self; {
   curl = derive2 { name="curl"; version="4.3"; sha256="1nrf6md41b37j424y6rvifdj9zb3j14f60fj7q71k9jhpf2x81kl"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
-  cursory = derive2 { name="cursory"; version="1.0.0"; sha256="0jyfp0i43fxh91n4s8r54hnzmq1y037176c8bv2q3fqjm1adibxy"; depends=[dplyr pkgcond purrr rlang tibble tidymargins tidyr tidyselect]; };
   curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; };
   curvHDR = derive2 { name="curvHDR"; version="1.2-1"; sha256="1a6b29kklyphv9iirm8xaxcdfcssk7ah4wm9ll53ls0alnzb15nw"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curveDepth = derive2 { name="curveDepth"; version="0.1.0.9"; sha256="10mhy2nyll4d1q71qnlsal0raccz3awd0j0vi5w58di9wlv1c241"; depends=[ddalpha Rcpp RcppArmadillo]; };
   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.3.0"; sha256="0zarqsdcjy8cymwrb6648nil509q9rhmp4633sidmmjclpyjca2q"; depends=[assertthat flextable gridExtra officer RColorBrewer rvg]; };
+  customLayout = derive2 { name="customLayout"; version="0.3.1"; sha256="1ijdg03l170q3c87y0kwjhls87ywl0wpvppw7rbswj2f1xs3jzq9"; depends=[assertthat flextable gridExtra officer RColorBrewer rvg]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.2"; sha256="0kjp22bzv7a3xynhm9xmabfcms21586p8caz1nk1w88qdvidqfqd"; depends=[FNN glmnet]; };
   customsteps = derive2 { name="customsteps"; version="0.7.1.0"; sha256="1v6ks8j1mj623yai515xnrpx60hvilbrsn59r3zw30n68555cvw8"; depends=[dplyr generics magrittr purrr recipes rlang tibble tidyselect]; };
   cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; };
+  cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
-  cutpointr = derive2 { name="cutpointr"; version="1.0.0"; sha256="043gl2vr166cr0l7a33grya3cvg2ligsaimw43f3g5l4y2nsndj4"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
+  cutpointr = derive2 { name="cutpointr"; version="1.0.1"; sha256="0nny2zp97ldfcd3ficyzlphv9fcwmpji9ynw7ygvx24skp291f35"; 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]; };
   cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; };
@@ -6540,40 +6546,41 @@ in with self; {
   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]; };
-  cwbtools = derive2 { name="cwbtools"; version="0.1.0"; sha256="0wdg559y3bcrvw0f2gyhbkbvp8hc00qz1h3xnhb52qp9siq8r6pl"; depends=[curl data_table pbapply R6 RcppCWB stringi xml2]; };
+  cwbtools = derive2 { name="cwbtools"; version="0.1.2"; sha256="0ylzh61587299zqa3i6fc76x2lhdmpvhj0h4bhqwy75csp1wisvp"; depends=[curl data_table pbapply R6 RcppCWB stringi xml2]; };
   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.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
-  cyanoFilter = derive2 { name="cyanoFilter"; version="0.1.2"; sha256="0nf76pwmgz9qp297dgp9qql4r8y468sa0mcy423hq13yp1swgx6w"; depends=[Biobase flowCore flowDensity RColorBrewer Rdpack stringr]; };
+  cyanoFilter = derive2 { name="cyanoFilter"; version="0.1.3"; sha256="01qws6lqh14rl0mwsmgsimssvzjlnvzir56pd9xyx9p2k8s19f56"; depends=[Biobase flowCore flowDensity RColorBrewer Rdpack stringr]; };
   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.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; };
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
-  cyphr = derive2 { name="cyphr"; version="1.0.1"; sha256="1shnry1wd3618y92bzdv4wld826hjscryql9l8p1hy9wcvmpbjzh"; depends=[getPass openssl sodium]; };
+  cyphr = derive2 { name="cyphr"; version="1.0.2"; sha256="0wfwkjn0a99n90f46c3y6vqpz5w549vm5slrjql9mz6l1r7jz0cf"; depends=[getPass openssl sodium]; };
   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]; };
   cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; };
-  cytometree = derive2 { name="cytometree"; version="2.0.0"; sha256="1amyqnzaz8pb74s30dg1kgqnmwi66yx88cwai9x82pl9h2mcc9ki"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; };
+  cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; };
   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.7"; sha256="0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a"; depends=[dplyr htmltools tidyr]; };
+  dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.1.1"; sha256="17vw8mf03ry2qz3nbwch51p2x1j18vrzyf881dh604wql5k8yfjc"; depends=[]; };
   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.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; };
-  dLagM = derive2 { name="dLagM"; version="1.0.19"; sha256="0bvzyv6hbs9n21gz2s24gmpzyxak6630j7dc9d6bzis1s2v08rda"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; };
+  dLagM = derive2 { name="dLagM"; version="1.0.21"; sha256="0ppgisp76a9fc3p63ckm445sh2dy5jybh5q7karg9hsx4y13appd"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; };
   dMod = derive2 { name="dMod"; version="1.0.0"; sha256="1mj2a9hpfldxbsiggi27nz3w0klp7qwpplpwh4bi9ik25vll25a0"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
-  daarem = derive2 { name="daarem"; version="0.4"; sha256="00gcy23yzwsfxvys7hncgshma73df0wzwnxgwvccppn3z213sg50"; depends=[]; };
+  daarem = derive2 { name="daarem"; version="0.4.1"; sha256="1krixphwjh4wp38in7ypwc4y4ncdrryhsnjnn1y48fm2jgc8zvjl"; depends=[]; };
   dabestr = derive2 { name="dabestr"; version="0.2.2"; sha256="10vzp28bx4vf9jc3l9jjw94wir75j8h60lcncafbdwvxjh5alpfs"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; };
   dad = derive2 { name="dad"; version="3.3.0"; sha256="1154jk4j1h5wr3c68pj0slh90jxccia28wpmygn9mz0mlvx9km9l"; depends=[DescTools e1071 lattice]; };
-  dae = derive2 { name="dae"; version="3.1-16"; sha256="089c19h5msq6j1hs2791x385g6nxgvhr89gxrgdybvwb8z2bbdwq"; depends=[ggplot2 plyr]; };
-  daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
+  dae = derive2 { name="dae"; version="3.1-21"; sha256="0b562s3w5h0nmq32yfw4y55w9ax2kgf67w3mdy5qaipqhjf35jq6"; depends=[ggplot2 plyr]; };
+  daewr = derive2 { name="daewr"; version="1.1-8"; sha256="1p5nblh745mq2zk48qa5dfpplywrz9yycmckv6ky4dv67j40qpqx"; depends=[BsMD FrF2 lattice stringi]; };
   daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
   dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
@@ -6583,18 +6590,18 @@ in with self; {
   damr = derive2 { name="damr"; version="0.3.4"; sha256="19rffdrgx9c03f66qgj1gwp5vra89n3jrrb54i9xl2rxsf28ry3h"; depends=[behavr data_table readr]; };
   dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; };
   dang = derive2 { name="dang"; version="0.0.11"; sha256="14bxzbkrqzs0ic7n4rlaa429lwdgldlcx97h8l7ma6jh8c0fx3qr"; depends=[]; };
-  dani = derive2 { name="dani"; version="0.1-0"; sha256="05npr3i49wn01rbcsr1pfbb0d5l8c0pz48q961v28s6kdxp0vwr3"; depends=[Epi]; };
+  dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; };
+  dann = derive2 { name="dann"; version="0.1.0"; sha256="0v6dnf7acjg6w64nwrscxhi3g7pr6bdiwdbiyaa8k760yg4r965n"; depends=[dplyr fpc ggplot2 magrittr MASS mlbench purrr rlang stringr tibble]; };
   dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; };
   darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; };
   dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
-  data_table = derive2 { name="data.table"; version="1.12.6"; sha256="1kgbnm5gv7ax7qn8irpz7qsry2ci21axga8y7qpkidcqkxkkndn2"; depends=[]; };
+  data_table = derive2 { name="data.table"; version="1.12.8"; sha256="1p7rf4v3ysflpgcmy9krkwmcy7z22wb08xm443649waz6lx5z9yk"; depends=[]; };
   data_tree = derive2 { name="data.tree"; version="0.7.11"; sha256="1mm27p3k2qw77wqrx05qs39nazcgpn0af0ahlps4gm62fs9pzddq"; depends=[R6 stringr]; };
-  data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; };
-  dataMaid = derive2 { name="dataMaid"; version="1.3.2"; sha256="10c5b1xp1mca5h0vdqikfn549jf981xk7c2rcpq71rf0fng93qz6"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; };
+  dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; };
   dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
   dataPreparation = derive2 { name="dataPreparation"; version="0.4.2"; sha256="12707zncdzsj05gw336g37qigbzq3iqmxx7agca32prx0mj39wdj"; depends=[data_table lubridate Matrix progress stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
@@ -6602,7 +6609,6 @@ in with self; {
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
   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.1"; sha256="1x8j34gj5c5arr1iqxfx8cs8hjapylvfjsnh4k6a34z65r83h93y"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
   dataesgobr = derive2 { name="dataesgobr"; version="1.0.0"; sha256="10znkaq45m4bgiyjx4x8s6ilvxlry6h0z54pkg8jgmblrpfazmqb"; depends=[dplyr DT httr jsonlite readODS readr readxl shiny shinycssloaders shinyFiles shinyjs shinythemes stringi stringr yaml]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; };
@@ -6610,21 +6616,19 @@ in with self; {
   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]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; };
-  dataone = derive2 { name="dataone"; version="2.1.2"; sha256="0rdn2jjqxkyf77xfbxy1zkdgrfhrcwd1dagidn0hynrldfj4r3iw"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
   datapack = derive2 { name="datapack"; version="1.3.2"; sha256="0v9m7fbzi1w5p3arb0ywl4yglyw87civc59ndqsdm8rp84gbvnbl"; depends=[digest hash redland uuid XML]; };
   datapackage_r = derive2 { name="datapackage.r"; version="0.1.2"; sha256="0y4adfgdf2k04aaimxzj1fz50j6w6fqc8gvjls47nlqhi3dgmdav"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; };
-  datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; };
+  datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; };
   datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; };
-  datarobot = derive2 { name="datarobot"; version="2.15.0"; sha256="1s3q83g8sjff7k0irv26kbnsd3h16hbw3qilqnvb9q824qza4psd"; depends=[curl httr jsonlite yaml]; };
+  datarobot = derive2 { name="datarobot"; version="2.16.0"; sha256="0hks5qww2m3l65qbmhybdc9zsbd8i8wj8vb5n9ss00bva1syi92v"; depends=[curl httr jsonlite yaml]; };
   datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; };
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
-  datasets_load = derive2 { name="datasets.load"; version="0.3.0"; sha256="13ywnqln831i5hlf1cpqcyc77blg99w8jvy8jic17z86fjxh4gim"; depends=[DT miniUI shiny]; };
+  datasets_load = derive2 { name="datasets.load"; version="1.2.0"; sha256="0x2m3k4grqizm97p41gjy3zkmhshicndp6cwyncl149yay6x8y5i"; 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.8"; sha256="1lf48c77z4br1sv8kdbxadn30v5ygn9shjgsf8g37rci7nngpx1k"; depends=[BH purrr Rcpp]; };
   datasus = derive2 { name="datasus"; version="0.4.1.1"; sha256="1vcyn0iia71c58959d3wcdqlh6336p3lsxbvwsj0fd9sll0a605s"; 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]; };
-  dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
   date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; };
   datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; };
   datetimeutils = derive2 { name="datetimeutils"; version="0.3-0"; sha256="1f63vzinj39pf85bw9xa4szkwmy4d4rxxnqm1jd396ywppgxzn7c"; depends=[]; };
@@ -6643,7 +6647,7 @@ in with self; {
   dbflobr = derive2 { name="dbflobr"; version="0.0.1"; sha256="1j97gwmqr8mv05yfd1dxm0v3l0vxrjrqf0drvkms2nja5asbhinq"; depends=[checkr DBI flobr glue RSQLite]; };
   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.7-0"; sha256="0fhvbn5v4b5n447hwljdzwfb68bpmrskwd7ni1vpqwcbix903rm4"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils]; };
+  dbmss = derive2 { name="dbmss"; version="2.7-1"; sha256="0gasvpgmmpq8x776qmfrv4xiniz2fi1zxywzi7rm8xgmwr5q9kp3"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; };
   dbparser = derive2 { name="dbparser"; version="1.0.4"; sha256="0s69da7czznnmv2kgipss1cdklx5ijh0q5aa2lg2gx3an1rjbgp2"; depends=[DBI odbc purrr readr RMariaDB tibble tidyr XML]; };
   dbplot = derive2 { name="dbplot"; version="0.3.2"; sha256="0xw1zjvf1fa092kyryq2pk7dd4y60ka8yczaxk0f231mmsm1741p"; depends=[dplyr ggplot2 purrr rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
@@ -6660,22 +6664,22 @@ in with self; {
   dcmodify = derive2 { name="dcmodify"; version="0.1.2"; sha256="093rh3r3n0wjdpx861xiqd1zqd5v1v9rzxgcynz4awr7jbm5xszi"; depends=[settings validate yaml]; };
   dcurver = derive2 { name="dcurver"; version="0.9.1"; sha256="1cfy0j3rmi3laszrgd3i59cfy4xfs2p6h9dcwbkwq6wnshrpypfn"; depends=[Rcpp RcppArmadillo]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-  ddalpha = derive2 { name="ddalpha"; version="1.3.10"; sha256="1064g7y8d7kmvd5kjc2m48yvidmh2ci1y0xgil3pcx4ix6mf0ljz"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
-  dde = derive2 { name="dde"; version="1.0.0"; sha256="0fsj7n66j0dhp65c6f9k0dsrkklj1hy4w376j150f91jc7m3wliv"; depends=[ring]; };
+  ddalpha = derive2 { name="ddalpha"; version="1.3.11"; sha256="1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
+  dde = derive2 { name="dde"; version="1.0.1"; sha256="0qgnxb27a2wnrbfk5v22i985mqhjp4hp05vl1ccsapbxkpf0gqcv"; depends=[ring]; };
   ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; };
   ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; };
-  ddpcr = derive2 { name="ddpcr"; version="1.11"; sha256="0slfgxp223mnn0f9k72p58m2frnp4c1dvdwsv5fwxw0h022wcrwr"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
+  ddpcr = derive2 { name="ddpcr"; version="1.12"; sha256="0kda154m588vdkjzm1vdr9irbb57l4w25pqjhqhawasvrna8nicf"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
   ddsPLS = derive2 { name="ddsPLS"; version="1.1.1"; sha256="03vi7dwg24sa3bmwkhvvw8x0vll2i59zlqa5w17fs9c7cbc77w3y"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp 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.25"; sha256="0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp"; depends=[]; };
+  deGradInfer = derive2 { name="deGradInfer"; version="1.0.1"; sha256="0yczn63fhpirvz1g1kq9q0m04sisflxxgxy70c87jyvrw12nfwss"; depends=[deSolve gdata gptk]; };
+  deSolve = derive2 { name="deSolve"; version="1.27.1"; sha256="05sax045qrk550gsn2i7krb9rbg51rx88x4v190acsigqknxffrv"; depends=[]; };
   deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; };
-  deTestSet = derive2 { name="deTestSet"; version="1.1.7"; sha256="0l73c0lwmbpg9prwy3hyd4m9q8r6689pdm47agyv59vj0839s25p"; depends=[deSolve]; };
   deaR = derive2 { name="deaR"; version="1.2.0"; sha256="1p3lsck0zwzfgjxyvzgvxig9g5p7i67pf71hrhzpmkxvafafx9jw"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; };
   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=[]; };
+  debar = derive2 { name="debar"; version="0.1.0"; sha256="03xlhnbvmkg93f6zl3x22rfwvs17fscvl8irmnm19pifk4bvbpyd"; depends=[ape aphid seqinr]; };
   debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; };
   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]; };
@@ -6691,9 +6695,10 @@ in with self; {
   deconvolveR = derive2 { name="deconvolveR"; version="1.1"; sha256="0iz8phshbzr0xpp3i305dyz75l95w4lh547lvw2fdvjqg6i0c6sv"; depends=[]; };
   deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
   deductive = derive2 { name="deductive"; version="0.1.3"; sha256="19h41a20c27gmky9xrgqkf0n2s8fzn2hiivs5dg71kl9gc4m1jhn"; depends=[lintools stringdist validate]; };
+  deep = derive2 { name="deep"; version="0.1.0"; sha256="1764cnsax8jwp2pb6rnmlb0f5m99jss84yi9rp017hdm20izvzrq"; depends=[]; };
   deepNN = derive2 { name="deepNN"; version="0.3"; sha256="1h2hk95ja8r4c9ha0phsndp4h5j3d4q4dw3mjmhycij7igy4m3kd"; depends=[Matrix]; };
   deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; };
-  deepgmm = derive2 { name="deepgmm"; version="0.1.56"; sha256="1hr987ff0a8d5pxfh8s6dqcn13inhadr2qgp9f4m6zkmhvhi185b"; depends=[corpcor mvtnorm]; };
+  deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; };
   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=[]; };
@@ -6706,15 +6711,15 @@ in with self; {
   delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
   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.4"; sha256="1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421"; depends=[boot]; };
   demoGraphic = derive2 { name="demoGraphic"; version="0.1.0"; sha256="0b2fqa0z875wwd7qdqh2qfvkzh2cpbmck4smf9c0p31wv5yin0sq"; depends=[magrittr MASS officer]; };
   demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; };
+  demoShiny = derive2 { name="demoShiny"; version="0.1"; sha256="15zfm8dxsjwqj1xlwz7r61cvnsajw4n6viqkakxrgsfpv1x62qaf"; depends=[shiny]; };
   demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; };
   demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-  demu = derive2 { name="demu"; version="0.2.0"; sha256="0prfl2i3q2n5f4qpvkksyi8qvwj2fd9v82cr6val7abvcvbn9276"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; };
+  demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; };
   dendextend = derive2 { name="dendextend"; version="1.13.2"; sha256="1iclvd9cyckd4djpa87ynm05fk6zl4b4m735za1w4irimc130m3r"; depends=[ggplot2 magrittr viridis]; };
-  dendroTools = derive2 { name="dendroTools"; version="1.0.6"; sha256="0y323sa1ccp6sr95rs9chm4mwxxja9dhjvg67lac2lf41a6yg5yb"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales]; };
+  dendroTools = derive2 { name="dendroTools"; version="1.0.7"; sha256="052957wbrwgnm5lab3ynwlziih4d0hhm7agaa907zfbrz2xl6nr0"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; };
   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=[]; };
@@ -6728,8 +6733,8 @@ in with self; {
   denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; };
   denvax = derive2 { name="denvax"; version="0.1.2"; sha256="0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx"; depends=[]; };
   depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
-  depmix = derive2 { name="depmix"; version="0.9.15"; sha256="1dnps6s5bfa834akjgx4zbg49danpy54mhiz1kjb4nmrnlb0zq7q"; depends=[MASS]; };
-  depmixS4 = derive2 { name="depmixS4"; version="1.4-0"; sha256="0v8hvkg7ia7c6a0x7rw5fddm06vv1n0kwjk7g0kj3g18chvpnvw2"; depends=[MASS nlme nnet Rsolnp]; };
+  depmix = derive2 { name="depmix"; version="0.9.16"; sha256="1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c"; depends=[MASS]; };
+  depmixS4 = derive2 { name="depmixS4"; version="1.4-2"; sha256="07d4fxwnbl3jqczrylbvdch9q87az37jrjsmvilhl9h98z31wzaq"; depends=[MASS nlme nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1.1"; sha256="0szy0027nh4ps1z919i740i50app5q7cfyg1fj7pdyl45nbl8k6m"; 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=[]; };
@@ -6748,30 +6753,30 @@ in with self; {
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
   designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; };
   designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; };
-  designr = derive2 { name="designr"; version="0.1.8"; sha256="04sd4av05rq4cwfx27rg0ig6maq4qiwr1q63wf9x7777q5r9zkg1"; depends=[crossdes dplyr MASS tibble]; };
+  designr = derive2 { name="designr"; version="0.1.9"; sha256="1rdnz7xq2h7bxb8fvsimj4bjdqx9z0xnsg59ibb0gi69vvlswac8"; depends=[crossdes dplyr MASS tibble]; };
   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.6"; sha256="1vxczs14afsapagvvsvcwi9ar3z74szs0m1g14zqkkkd47h3cij3"; depends=[ggplot2 lattice reshape2]; };
-  details = derive2 { name="details"; version="0.1.2"; sha256="03b0wz03mqwna5n3gkcidrcwbagdky43m6pg8wdk6y384r6r1l14"; depends=[clipr desc httr knitr magrittr png withr xml2]; };
+  details = derive2 { name="details"; version="0.2.1"; sha256="03fw3jbf1a34w9c205wwjkqnw6ic1gylsf36qw33mx4ba252s2hy"; depends=[clipr desc httr knitr magrittr png withr xml2]; };
   detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; 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.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
   detrendr = derive2 { name="detrendr"; version="0.6.4"; sha256="0n7mrh05y5jg2y77xv25yadw01lr8ms5ki32i32k38zlc635c1sl"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; };
-  detzrcr = derive2 { name="detzrcr"; version="0.2.6"; sha256="0ip4fywrpq8gf4xy0h302l5hpbgg0f9xi3lrnbzqm3701bas3c7m"; depends=[ggplot2 MASS shiny]; };
+  detzrcr = derive2 { name="detzrcr"; version="0.3.0"; sha256="1f4c6l9nk7cis5gnf3f97nys4b9c13cxcn2h1m60mva1d5p9zzpb"; depends=[DT ggplot2 MASS shiny]; };
   devEMF = derive2 { name="devEMF"; version="3.7"; sha256="0fv44y440xr52xymh1zyrryf7xrkm9lbs3qgybwfzz0ssx2iy6al"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
   devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; };
   devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; };
   devtools = derive2 { name="devtools"; version="2.2.1"; sha256="0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; };
-  dexter = derive2 { name="dexter"; version="1.0.1"; sha256="1b6nlnp9m5lvd7cxrzx246q4n2b3jqqi8a4cask1sskldgq1pnfc"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; };
+  dexter = derive2 { name="dexter"; version="1.0.3"; sha256="1400m0wq1yqsiyihycfc41pa5zjzbjjh81aj4k20h627bkj75dn7"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; };
   dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
   dextergui = derive2 { name="dextergui"; version="0.2.1"; sha256="1c92j70zihzsqi83rs7hgnp70qgg6y0hdcs3gxin80grsihj1frw"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 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=[]; };
   dfConn = derive2 { name="dfConn"; version="0.2.1"; sha256="03yl00mqj6r7p2xmrwam2chgqlq4qpfcm85n4b3b41vrm27xg11g"; depends=[data_table doParallel fields foreach ggplot2 gplots gtools nlme Rcpp RcppArmadillo stringr]; };
-  dfadjust = derive2 { name="dfadjust"; version="1.0.0"; sha256="17x6vnj1b7b9lrkn5a1nlgccpw77y9bhkrwv24hh7wji84gn8j76"; depends=[]; };
+  dfadjust = derive2 { name="dfadjust"; version="1.0.1"; sha256="0hzfkgf84j670vi4jfhlggbnzj96xa860212y3b0h5liwz1iazsy"; depends=[]; };
   dfcomb = derive2 { name="dfcomb"; version="3.0-0"; sha256="1vsqlhmajv33nbnh8igisyv3rzzh2fdwbk5y0zlnrwvr79r19k5w"; depends=[BH Rcpp RcppProgress]; };
   dfcrm = derive2 { name="dfcrm"; version="0.2-2.1"; sha256="01rn3zvi9xljmx48lkclckhnixian1vwq1frr8n784dsclp86spg"; depends=[]; };
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
@@ -6783,19 +6788,20 @@ in with self; {
   dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
   dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
-  dglars = derive2 { name="dglars"; version="2.1.4"; sha256="1yvw6k0rspaqj42dnnkj828las5v83hqd3db6h94ydcs05n6ym06"; depends=[Matrix]; };
+  dglars = derive2 { name="dglars"; version="2.1.5"; sha256="0d66vcn16l9w638vwplj9cmhdq6q1rlg9rhaycxpa6788x44di85"; 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.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=[]; };
+  dhReg = derive2 { name="dhReg"; version="0.1.0"; sha256="07x2zfcskia79xvz40g30qd9f2d4bn2s26bw892s469v3hcdqzyp"; depends=[forecast future future_apply testthat]; };
   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.3-1"; sha256="1hbh0j9bybz1dv5krygzaharpg4prfj29h8jn4x88jiiip64f4rc"; depends=[lme4 meta]; };
-  diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
+  diagonals = derive2 { name="diagonals"; version="1.0.1"; sha256="0m9hlxww6n405fn26gbw36kjlb7b9759hj56lz820wkj972zw301"; depends=[]; };
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
   dialr = derive2 { name="dialr"; version="0.3.0"; sha256="1wdl3m6mlpxhy75kyzxypf053n2zaf8skk0xq1m4gklq4disbg32"; depends=[dialrjars rJava]; };
   dialrjars = derive2 { name="dialrjars"; version="8.10.14"; sha256="0xzgrqgydgrljp3ylqk24hwgj9mcpxsfd4xp3wx8k1d4jmz80gw8"; depends=[rJava]; };
@@ -6817,7 +6823,6 @@ in with self; {
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEnrich = derive2 { name="diffEnrich"; version="0.1.1"; sha256="19bq2frd2h8gh6mdy3pcwd54zzv170c0m1m3wnp5c4gadb9424qf"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; };
   diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; };
-  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.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; };
@@ -6841,16 +6846,17 @@ in with self; {
   dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; };
   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.1.1"; sha256="01j8kah94qlmag2ysdl0p9nj2pqsivkdg1aammq04d8j97pm82yb"; depends=[]; };
-  dipsaus = derive2 { name="dipsaus"; version="0.0.3"; sha256="061nvdn3x9bqps5d60zzb41f39h8qy3y3xdfib508zgarbpb67nq"; depends=[base64url cli crayon data_table digest fastmap filelock future future_apply jsonlite qs R6 Rcpp RcppParallel rlang shiny stringr txtq]; };
+  dint = derive2 { name="dint"; version="2.1.2"; sha256="01z3fw3rhhnwgibgrcgv0n2664s78xndk1k2jghz7ig07sgrmr8p"; depends=[]; };
+  dipsaus = derive2 { name="dipsaus"; version="0.0.4"; sha256="1qh4aqhg9y1z4wf81fjc42418wz6rz0mn537ys6av8ln2qy4b2v9"; depends=[base64enc base64url cli crayon data_table digest fastmap future future_apply jsonlite R6 Rcpp RcppParallel rlang shiny stringr synchronicity txtq]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.4"; sha256="0rbdygdslr2gvg4mvnp09lc9rv0sg9jwdf5a5ks50v67n25x6y5d"; 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.3.0"; sha256="0hhvmnkx2y5sl308vrx349jr54daifgz4pj5gfykn42gppcpw56v"; depends=[ggplot2 gtools mvtnorm]; };
+  dirichletprocess = derive2 { name="dirichletprocess"; version="0.3.1"; sha256="09ibrlsbn80ghrblk6qblrs0s8fzfnjash1v7x6a2hpg92h9g86y"; 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.4.0"; sha256="0bzsbbd7jzlb3zg09pj4csgj9vavxx35yl8cg11x46f38071p7y3"; depends=[data_table functional mgcv mvtnorm]; };
+  disaggregation = derive2 { name="disaggregation"; version="0.1.2"; sha256="1ga87gawbivgf3zb34m0qc72v16ds5vq49gx8y5xmrgnk0975x12"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; };
+  discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; };
   discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; };
   discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; };
   discharge = derive2 { name="discharge"; version="1.0.0"; sha256="1hwsdrbajmpfdc9arb1pjhx2w45dy3zrba9ibcrnpyqhhr4i1c5m"; depends=[boot checkmate CircStats ggplot2 lmom]; };
@@ -6858,18 +6864,17 @@ in with self; {
   disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; };
   disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; };
   discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; };
-  discoveR = derive2 { name="discoveR"; version="1.1.0"; sha256="00hqaq7gmlf7dpdw6i3f50jvp8m8095ld15lb0zy3zl7b80mr278"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; };
+  discoveR = derive2 { name="discoveR"; version="1.2.4"; sha256="0f1f4wmh4ys3awlf5kxm6l0xj2qw86y14sj03bd1gs252r43zrbg"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; };
   discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
   discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; };
-  discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.5"; sha256="1q4g455jjg293yxdwdppw04ah15idk5j233x2kbqv0jni4v0l2bf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; };
+  discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.6"; sha256="10rw3x58xlhyvrnsryypy8r8hqp3nswsii37z9hzm2wa00ffl3sf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; };
   discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
   discrim = derive2 { name="discrim"; version="0.0.1"; sha256="1g698bimrvzbzzv6mfafwmdyyziscr055zhssnz69j250mh81kyw"; depends=[dials parsnip purrr rlang tibble withr]; };
-  discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
   diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; };
-  disk_frame = derive2 { name="disk.frame"; version="0.2.1"; sha256="1a3q1zwp5aarpb9780g6r0d4vbflf7qfnh2j4v6jkbmzalbd582n"; depends=[assertthat bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; };
+  disk_frame = derive2 { name="disk.frame"; version="0.3.3"; sha256="0wxc73sh8k5inwxlgrv3cjmkc6bqvdh9i1dqdpnfmxs2kirr17i8"; depends=[bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; };
   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.3.1"; sha256="0pf6c1byw095q7a6zx0sgwl84a5djkaaq1ly5jpcv0q0l0c9kxxh"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; };
+  dispRity = derive2 { name="dispRity"; version="1.3.3"; sha256="0lq6zf335312phriyh1mz4w6rwljjdipdj0qfb3298f6nkwp2miy"; depends=[ade4 ape Claddis 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=[]; };
@@ -6890,11 +6895,11 @@ in with self; {
   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.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; };
-  distr6 = derive2 { name="distr6"; version="1.3.1"; sha256="0chv04nsay2kjfxicf9b001wj71rfhxnrbbqj16mab80ilrhv40q"; depends=[checkmate data_table pracma R6 R62S3]; };
+  distr6 = derive2 { name="distr6"; version="1.3.2"; sha256="04v98si3slhzl5z424ylpp6d9m3220w9sppjfnr1py9b1kap43gx"; depends=[checkmate data_table pracma R6 R62S3]; };
   distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; };
   distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
   distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; };
-  distrMod = derive2 { name="distrMod"; version="2.8.2"; sha256="0rzz83qj8hx65ir9llk1ai12pcg60sis4np7xgdl772vsh9n7f7n"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
+  distrMod = derive2 { name="distrMod"; version="2.8.3"; sha256="0zg7wc9khfi66yl80k472hwvyc3wf2kbqwd1zsp6sb44jh9hlzsw"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
   distrRmetrics = derive2 { name="distrRmetrics"; version="2.8.0"; sha256="17kbl8b4q8w7il1f02yqr11filhbd5axjwwna20gvjim501jizwi"; depends=[distr fBasics fGarch startupmsg]; };
   distrSim = derive2 { name="distrSim"; version="2.8.0"; sha256="0g16mljlz7fnb5k6c9h5vplm3n51sdbybv9cifbia0y6p9zml383"; depends=[distr setRNG startupmsg]; };
   distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; };
@@ -6909,12 +6914,13 @@ in with self; {
   diveMove = derive2 { name="diveMove"; version="1.4.5"; sha256="0lik5r5y7q5r7gh9d9y9r2m8vvibn13dp9p50j0hpzk67wgw3vya"; depends=[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-11"; sha256="1jqfjmmaigq581l4zxysmkhld0xv6izlbr1hihf9zplkix36majc"; depends=[ape deSolve Rcpp subplex]; };
-  divest = derive2 { name="divest"; version="0.8.1"; sha256="1lchxndmfz7gl0p0iy0r72flwzvg6v4ygxyzydhcks9c7zz1shm3"; depends=[Rcpp RNifti]; };
-  divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; };
+  diversitree = derive2 { name="diversitree"; version="0.9-13"; sha256="00vi4klywi35hd170ksjv3xja3hqqbkcidcnrrlpgv4179k0azix"; depends=[ape deSolve Rcpp subplex]; };
+  diversityForest = derive2 { name="diversityForest"; version="0.1.0"; sha256="1vxn0qzv509sqcg5ra94yw9anagrpvj90j9rkfh8v9bmmcj6pcjy"; depends=[Matrix Rcpp RcppEigen]; };
+  divest = derive2 { name="divest"; version="0.8.2"; sha256="0kzl3niscd88kzlpnx75xx6mk1jkwxwn7gm2a6vnhpvniyyk6rs8"; depends=[Rcpp RNifti]; };
+  divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; };
   dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; };
-  dixonTest = derive2 { name="dixonTest"; version="1.0.0"; sha256="0nv2qyivr9agr8s2l95jdz3sj21i60asdi5mx1dbn61yqbzv80q6"; depends=[]; };
-  diyar = derive2 { name="diyar"; version="0.0.2"; sha256="0gjj6r520dlm034m4361y87lim5h0n904mw2m0avfpkzr54siyx9"; depends=[dplyr lubridate rlang tidyr]; };
+  dixonTest = derive2 { name="dixonTest"; version="1.0.1"; sha256="080s5vkxn5lif9xk4q47ivq76dqda1k0srd7iaa0i48yny5f7mk2"; depends=[]; };
+  diyar = derive2 { name="diyar"; version="0.0.3"; sha256="1m4rs6q3gwpl9v62cmam3z207wsy2z2xr2dhxdqzggq8yk6qc83q"; depends=[dplyr lubridate rlang tidyr]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
   dkanr = derive2 { name="dkanr"; version="0.1.3"; sha256="1zic7qhwq3s9w70zi1f6qyf7pzm69k5a1p5fd4n3z4nbga54njxd"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
   dlbayes = derive2 { name="dlbayes"; version="0.1.0"; sha256="058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0"; depends=[expm GIGrvg glmnet LaplacesDemon MASS]; };
@@ -6922,12 +6928,13 @@ in with self; {
   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.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; };
-  dlookr = derive2 { name="dlookr"; version="0.3.12"; sha256="1963b9cjfs56jazvizfj2yj7vkzav6z87z3ii1wbdpk33d76bxmy"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
+  dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
   dlsem = derive2 { name="dlsem"; version="2.4.5"; sha256="0ywcssjzkdqxlmjbsqdcgl9kivih5zw865556lnxx3zqnfygxzlv"; depends=[graph Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
   dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; };
   dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; };
   dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; };
+  dmdScheme = derive2 { name="dmdScheme"; version="1.0.0"; sha256="1l3s7nf0xik8q0j7krrmh1n0g06671l4p2grmswgd4s2wgjq48k2"; depends=[digest dplyr knitr magrittr openxlsx rappdirs readxl rlang rmarkdown tibble writexl xml2 yaml]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
   dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
@@ -6937,29 +6944,29 @@ in with self; {
   dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; };
   do = derive2 { name="do"; version="1.1.0.0"; sha256="1v80vq8rc8ywajgi08xxkpcbhi800qjix5fyqi12ynq83wqmn93x"; depends=[data_table plyr]; };
   doBy = derive2 { name="doBy"; version="4.6-3"; sha256="1d0d6pwai1g4i5jls0jm9va29ci5hy92n5957608f3fzi1jwy635"; depends=[broom Deriv dplyr magrittr MASS Matrix pbkrtest plyr tibble]; };
-  doFuture = derive2 { name="doFuture"; version="0.8.2"; sha256="0p69gh3adwhinpxry380wccwiq85zr2h49chxz1qwacavvafcvv8"; depends=[foreach future globals iterators]; };
+  doFuture = derive2 { name="doFuture"; version="0.9.0"; sha256="1sfymhgjph1xrw49dxyc2slxxgal7v4yanklr4zql7r4vqinhk19"; depends=[foreach future globals iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; };
   doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; 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.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; };
-  dobin = derive2 { name="dobin"; version="1.0.0"; sha256="023s1gq9wqsaf9390nxqclpwwmxfpyv0sxxb8nnck7lpsl5g1pkl"; depends=[FNN pracma]; };
+  dobin = derive2 { name="dobin"; version="1.0.1"; sha256="11k97bmgigkiqkz9r5ilap5l2xdpwprl9v7f73rckxcw6pwsnlk3"; depends=[FNN pracma]; };
   dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; };
-  docknitr = derive2 { name="docknitr"; version="0.4.0"; sha256="1gc2dvji07fzmippnnk6m8v7wra4cprfayqa6skymnp14nf14h00"; depends=[knitr]; };
+  docknitr = derive2 { name="docknitr"; version="1.0.1"; sha256="1mhdjv6yznzyx911f0m3m0i7jlzj7h12ikkxb9b6zj68bdplv30b"; depends=[knitr rstudioapi sys]; };
   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.1.0"; sha256="05cks0yrjwkbpdcx0llh2p7fi4xybmrrqflw21sq8w0pivjkpwc6"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
+  document = derive2 { name="document"; version="3.2.0"; sha256="0k1sqh9sn9lvv8r05byicrhg07jfnas8h9pyij42pgdvy93rinvy"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
   documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; };
   docxtools = derive2 { name="docxtools"; version="0.2.1"; sha256="09fcamrr3yw1zrj4bx8ra9yidprk1h44p48by85zjqwd1ly4gqbf"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.6.1"; sha256="03bcaiwxxybbdxh26rp4bl66aiv4hxmgn21w6dxm383xha03iqfw"; depends=[dplyr httr magrittr purrr xml2]; };
   dodgr = derive2 { name="dodgr"; version="0.2.5"; sha256="0n4jh7rdj4qxmi1wns3ida8pa7rlvz6lrjl0n9ba18w3mgg1z483"; depends=[callr digest igraph magrittr osmdata Rcpp RcppParallel]; };
   doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; };
-  dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.2.0"; sha256="04x0l37lbdjflz2jr5h95hd9a3c858p7j1p2mscyn08c986j04mb"; depends=[]; };
+  dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; };
   domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; };
   donut = derive2 { name="donut"; version="1.0.0"; sha256="1m10kcdcr9ma4zmc1gj3lyza8zxvnn57wvxznaappaba4a5b47v2"; depends=[]; };
   doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; };
@@ -6987,6 +6994,7 @@ in with self; {
   dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; 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]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
+  dppmix = derive2 { name="dppmix"; version="0.1.1"; sha256="1gq51kix0jln25gr6bffzdy24fhn6cd3gmyl3jlmvqvni4vwswy7"; depends=[mvtnorm]; };
   dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; };
   dqrng = derive2 { name="dqrng"; version="0.2.1"; sha256="0rp8q5zijlvaqmpnkwr314w9w40sj4fz7sqsdgsffcfvn42w2jg1"; depends=[BH Rcpp sitmo]; };
   dqshiny = derive2 { name="dqshiny"; version="0.0.3"; sha256="1fra6fbv8if7wwr8vi3261rdzv4kj99y841lb9xiv1mh72r3mx58"; depends=[htmltools shiny]; };
@@ -6996,38 +7004,37 @@ in with self; {
   dragon = derive2 { name="dragon"; version="0.2.1"; sha256="1y2dav9151zdcqw1maxhh3s4c1syk5rs8yb8grx8xkffvg5123w7"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; };
   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="7.8.0"; sha256="0s9dv0013vknpcagrd1makzpzmkf8ag5b2zja4vw3d4895cpx6vd"; depends=[base64url digest igraph rlang storr txtq]; };
+  drake = derive2 { name="drake"; version="7.9.0"; sha256="1p3d14yi65p7x2hpvfhvwpbaasawvj3i0h9ws1ic4c096gclw1b3"; depends=[base64url digest igraph rlang storr txtq vctrs]; };
   drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; };
   draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; 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.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; };
-  drgee = derive2 { name="drgee"; version="1.1.9"; sha256="0nblv7yrbq9kvnbjs13adhj5lmwim6p6sz0550fk78lh7h99hl0q"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
+  drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; 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]; };
   drifter = derive2 { name="drifter"; version="0.2.1"; sha256="1xsp8cm02wd8zink0jqrdaii7s2dh0rw96rs6k8zr2g0341wmfba"; depends=[DALEX dplyr ingredients tidyr]; };
   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.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.4"; sha256="0k8cps3kpfrlv33a0czjp327qzdj69lwbpv4k5q7qjcv0878yypg"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; };
+  drtmle = derive2 { name="drtmle"; version="1.0.5"; sha256="1gnzprdjs4aws5q92a0dmlfzpwi3in3rsylbwr0r6cnghymgs69s"; depends=[doFuture future future_apply future_batchtools np SuperLearner]; };
   drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
   drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; };
   ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; };
   ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; };
   dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; 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]; };
+  dscore = derive2 { name="dscore"; version="1.0.0"; sha256="1569bv769izsbqslbij69nq5lagd2676zavs9fkwbsqw7j9nb5x0"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
-  dslabs = derive2 { name="dslabs"; version="0.7.1"; sha256="1paagq2wxikf1kxplh88iwscfgqsqjyj9c1hh5j843n9vkr4dv3j"; depends=[ggplot2]; };
+  dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; };
   dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; };
   dsm = derive2 { name="dsm"; version="2.2.17"; sha256="0n2nn05zb8zd2wah1cfzv8a9qwbh6an3jwsfy0x6lbkk63bs5mxw"; 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.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
-  dssd = derive2 { name="dssd"; version="0.1.0"; sha256="1pcky2rwm0811y2b8lpsm4nv0s4hs5idkk6jwc9kr67kciqziqs3"; depends=[plot3D sf]; };
+  dssd = derive2 { name="dssd"; version="0.2.0"; sha256="0g99aaywqlvs9ycb3mkbkziclvrsdknpv3jg340z03panph4yr1q"; depends=[lwgeom plot3D rgdal sf]; };
   dst = derive2 { name="dst"; version="1.4.0"; sha256="0zr04m33ky98y5n6jbczcfn898i7y8zc1hygfm8p9rrnw93d2lin"; depends=[]; };
   dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; };
-  dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
   dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; };
-  dti = derive2 { name="dti"; version="1.4.3.1"; sha256="147s8aj65jyrz9qwiwjpa3ly1nsv201z5r7xmg03fj2vlx93k44k"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
   dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; };
   dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; };
   dtplyr = derive2 { name="dtplyr"; version="1.0.0"; sha256="115b08fc3rpj101i0j5gx2z3w80ylgampzvb674jhx2jxf4kl9c7"; depends=[crayon data_table dplyr rlang tibble tidyselect]; };
@@ -7036,7 +7043,8 @@ in with self; {
   dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; };
   dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.5"; sha256="0qvjzqmi6plkq5l4r52c7wil58n41l5f5dxzpk9r4yis8bdm5zlq"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.5.5"; sha256="1jmbcmkw7kvd0vr8rlnqyi5i8kgnlxm5rwbgjzl8cv2d3v67rm18"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
+  dual = derive2 { name="dual"; version="0.0.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; };
   duawranglr = derive2 { name="duawranglr"; version="0.6.5"; sha256="04w8ll6p8m0ljcp96sfp028afgxddk4wyncfdwiywi0ps34zh084"; 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]; };
@@ -7046,8 +7054,7 @@ in with self; {
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
   dupree = derive2 { name="dupree"; version="0.2.0"; sha256="12dlqmvk2zlxh283xjf2d6x12cy6r3rsy88y5g40h9002m7i2jqy"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; };
   durmod = derive2 { name="durmod"; version="1.1-2"; sha256="1mp97x8px4s53m91m5vnkixgz087wgd4bas64xdbki6y53zimzjj"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; };
-  dvmisc = derive2 { name="dvmisc"; version="1.1.3"; sha256="0x391pxg5mqgp5xxc8qwhwxky8ds7d9gr9iwmsb12c92kxfk00bv"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma purrr rbenchmark Rcpp survey]; };
-  dwapi = derive2 { name="dwapi"; version="0.1.3.1"; sha256="1sz4n8vn7cmlilxzhkm4rdfca0904cbh28n5383p9pr46bdi69q5"; depends=[httr jsonlite readr rjson xml2]; };
+  dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; };
   dwdradar = derive2 { name="dwdradar"; version="0.2.0"; sha256="06wa3m77931lv47530hyczwdjrrfdmgczmbhwy0z9fzhn8kz0ipp"; depends=[]; };
   dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; };
   dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; };
@@ -7074,7 +7081,7 @@ in with self; {
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynparam = derive2 { name="dynparam"; version="1.0.0"; sha256="0rzkksb0j7vybz4mk9c4sm3zcxdjll1bqx54cbal8a0iq259rigp"; depends=[assertthat carrier dplyr dynutils Hmisc magrittr purrr stringr testthat tibble tidyr]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
-  dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; };
+  dynprog = derive2 { name="dynprog"; version="0.1.1"; sha256="11zsx2c4hv7k22pw85aa01zk4r0qpzwnf73ynylkfxfbi87rda9s"; depends=[rlang]; };
   dynr = derive2 { name="dynr"; version="0.1.15-1"; sha256="1vd93mckc8q8wvs3sgly7j1vn1i2qis6pcyqiag6nqz5xjfv6rn4"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.6"; sha256="0sdy42ihymhzx577jc2qr7lwirc9lviz3sagfy09zhbwizz5a4kw"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
@@ -7091,7 +7098,7 @@ in with self; {
   ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; };
   eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; };
   eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; };
-  eSDM = derive2 { name="eSDM"; version="0.3.1"; sha256="1q0482n7p4880brjnrfg4xzqz7wz4g6v4rdgg3ljnhidipszkp2d"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; };
+  eSDM = derive2 { name="eSDM"; version="0.3.2"; sha256="0vjphknba4a6y1wdgv9v6r3a6kj088fq83b4387d4z72g0kkwcmc"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; };
   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]; };
@@ -7108,13 +7115,12 @@ in with self; {
   easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.3.3"; sha256="0hhi1nwc84b0mjs2sw2qmvj3cmfkk9kr3rni9fkyyds1dhwgrvvh"; depends=[sdcTable shiny SSBtools]; };
   easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; };
-  easyalluvial = derive2 { name="easyalluvial"; version="0.2.1"; sha256="1lrlakq84q0xgyh930img6mzz1ffjbcyxqfh80zy7fndwixzwpys"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; };
+  easyalluvial = derive2 { name="easyalluvial"; version="0.2.2"; sha256="0x7rkxvpc9xbkhnb5r1bal0fircn412v34fwgpm42h21rkjwiybw"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; };
   easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; };
   easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; };
   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]; };
-  easyr = derive2 { name="easyr"; version="0.1-1"; sha256="0ha64fl9kvnnc4i9bwg7bv065w2v1y7lcdgsyp7s6ik2lpfc73rx"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang stringr tibble XML]; };
   easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; };
   ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
@@ -7130,28 +7136,29 @@ in with self; {
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; };
   echarts4r = derive2 { name="echarts4r"; version="0.2.3"; sha256="0yxgxwsyhmbnw3llcgr4xh0i0d74awgsapdw7xsh57wzc539666m"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr scales shiny stringi]; };
+  echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; };
   echo_find = derive2 { name="echo.find"; version="3.0"; sha256="15rrja2z01y4pbh2w4h2xcnwv9c81ppnb848203vavvlilm475y1"; depends=[boot minpack_lm]; };
-  echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
+  echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; };
   echor = derive2 { name="echor"; version="0.1.3"; sha256="1m843219038jvmwd5fsnlh63nl7as7d4030i6wnksg6pw6v6f1s8"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang 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.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; };
   ecmwfr = derive2 { name="ecmwfr"; version="1.2.1"; sha256="0crqmr3rph0xkxkfgl3rz3aqc75vh7kn7sjnixspg04mh2p27cpb"; depends=[httr keyring memoise]; };
   eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; };
-  ecodist = derive2 { name="ecodist"; version="2.0.1"; sha256="04piv52b4b9rgv1gy6s3b1lzapc0rqiwp1yi7f8yzgjd9329kc5g"; depends=[]; };
+  ecodist = derive2 { name="ecodist"; version="2.0.3"; sha256="1fhlsiywvfyw03dhbwk2g9blymsjvzhcbwdsqn59bmdjk7aiy79x"; 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.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
   econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; };
   economiccomplexity = derive2 { name="economiccomplexity"; version="0.3"; sha256="058cyzr01jrgi9090wn8vpjhf074bq7g76vfbyk58jic0k78k634"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; };
-  econullnetr = derive2 { name="econullnetr"; version="0.1.0.1"; sha256="1ssgvz17a2cpwag786rc6azi3cz74cc4bxz5jjrn1bfq8ch8xqd3"; depends=[bipartite gtools reshape2]; };
+  econullnetr = derive2 { name="econullnetr"; version="0.2.0"; sha256="1amgwcsm42ffrdx5a11nkvdx37qqjfh7z54z1hl4b07n8rg1rp7c"; depends=[bipartite gtools reshape2]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; };
-  ecotox = derive2 { name="ecotox"; version="1.4.0"; sha256="1x048njvlq7mp0fpx2nal8znhnkw5cnq2z0rmvknm2m66lfhds7a"; depends=[ggplot2 tibble]; };
+  ecotox = derive2 { name="ecotox"; version="1.4.1"; sha256="12dfnsvqwk4iy8r3iks51hh1gcj3hhws10hsng6daqc0xp1y6dpr"; depends=[tibble]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
   ecoval = derive2 { name="ecoval"; version="1.2.5"; sha256="0rlgi8cd7jdybb2dqx6ndp8rg02bvsvhksmh8vk8g5fg2wk0rll3"; depends=[jpeg rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.1.2"; sha256="11f9p869xr0zg779i46gmflxlq4xclk9wxbab0nj2fan26pn4sfy"; depends=[Rcpp]; };
@@ -7170,7 +7177,6 @@ in with self; {
   edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
   edgar = derive2 { name="edgar"; version="2.0.2"; sha256="1cxx08l06dv38n5af7wyb22zslwzz5pxvg5r4520zd2k7w2m7k1l"; depends=[qdapRegex R_utils stringi stringr tm XML]; };
-  edgarWebR = derive2 { name="edgarWebR"; version="1.0.0"; sha256="0rnf3s5d5sclvd4y195mfkrazg4qvpyyrgl6jcqikygbcz8hg3j8"; depends=[httr xml2]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
@@ -7199,12 +7205,12 @@ 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.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; };
-  eggCounts = derive2 { name="eggCounts"; version="2.2-1"; sha256="01lbinwc91pyynhny3lpdh0gb8fffk4dq8a99ps0mbsk8aa5735j"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; };
+  eggCounts = derive2 { name="eggCounts"; version="2.3"; sha256="0y74dd8s406yz6nhwlb09hgarw90a68wji2vykxpqcrfll814g7q"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; };
   egoTERGM = derive2 { name="egoTERGM"; version="2.1.1"; sha256="1zp3kr7s43rjp45qbd6lv48mbmby5rrz1vdz9s64v43rjm8v2jyz"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; };
   egor = derive2 { name="egor"; version="0.19.10"; sha256="0s9s15j1v5z2v8jhfz8zrmfl43hmn7rw1afs1wjw1kvzz41k1jlm"; depends=[dplyr igraph network plyr purrr rlang shiny survey tibble tidygraph tidyr]; };
-  eha = derive2 { name="eha"; version="2.7.6"; sha256="01q75bn3r06zwbfa6p69whdkilqx53ysxa3cz2d50jvd79bqlf4h"; depends=[survival]; };
+  eha = derive2 { name="eha"; version="2.8.0"; sha256="0nsspy1v780hlvhbpp78ybmxrwqbj12nz98pnh495dnlkq5fa5h5"; depends=[survival]; };
   ehaGoF = derive2 { name="ehaGoF"; version="0.1.0"; sha256="1qrx9rmf4ifasxycnzj06xn3gl0gp9w1vplb4wrghiziqw5cqird"; depends=[]; };
-  ehelp = derive2 { name="ehelp"; version="1.1"; sha256="0zxa6aq75w4k4pkk47wmdird2r8jvqvkbbzhilmv0f7z36lrr894"; depends=[]; };
+  ehelp = derive2 { name="ehelp"; version="1.1.1"; sha256="1sd8g0a94dg8l568srxxsvyc0nmvbsy1rq75sn8cc2cdxv4vilq8"; depends=[]; };
   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-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; };
@@ -7219,7 +7225,7 @@ in with self; {
   eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
   eixport = derive2 { name="eixport"; version="0.4.0"; sha256="06knza8mm7d8i1h72axq3s9id1cdrrq0gjc6lc3q65hf5hx89k1q"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
-  elastic = derive2 { name="elastic"; version="1.0.0"; sha256="1mq2ayq4dwb1y0dkp3v30qs6vh2d5q4brcifjrvq7wifh4r6gnpk"; depends=[crul curl jsonlite R6]; };
+  elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
   elasticnet = derive2 { name="elasticnet"; version="1.1.1"; sha256="0p9dplnsp28z4s2fl6afbwrgd0aj339fak8mmndicmrh7bb7rpmb"; depends=[lars]; };
   elasticsearchr = derive2 { name="elasticsearchr"; version="0.3.1"; sha256="0v79kb0w33n7l64ipkq0bd7kp5hmj6cvxf5rflqjd412lnf669q8"; depends=[dplyr httr jsonlite]; };
@@ -7241,23 +7247,23 @@ in with self; {
   ellipsis = derive2 { name="ellipsis"; version="0.3.0"; sha256="01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b"; depends=[rlang]; };
   elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; };
   elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; };
-  elo = derive2 { name="elo"; version="2.0.0"; sha256="0cryr1cgvs5z54piw6yrv9fd7nrqv1kwxw5ahx46k7qxdgr5bb2s"; depends=[pROC Rcpp]; };
-  emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
+  elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; };
+  emIRT = derive2 { name="emIRT"; version="0.0.9"; sha256="0861xa299qkdmmbxl2zsr1al4ysznzbx4yj9z655mrm9b11sh4bj"; depends=[pscl Rcpp RcppArmadillo]; };
   emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; };
   emba = derive2 { name="emba"; version="0.1.1"; sha256="0sgh97jzfxna4dww8xmj1qy5435d4lm2yar2ra6nf416snlppjxv"; depends=[Ckmeans_1d_dp igraph magrittr rje usefun visNetwork]; };
-  embed = derive2 { name="embed"; version="0.0.4"; sha256="02rwifkpghwymsqnkn43p2gylnlxk2a3bqmssh7amd3d6rpl3wl8"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; };
+  embed = derive2 { name="embed"; version="0.0.5"; sha256="0iwhif1yq3wb6xy0k03w0ygyl8rlcal0h2ncxc9rwqlny8xgvxph"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; };
   embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.11"; sha256="0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="1.1.6"; sha256="1zxbbn0rl2z7zksh1k8wznry4k1bs08ipla1kaxyadj3i2wdk2y3"; 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=[]; };
+  emg = derive2 { name="emg"; version="1.0.8"; sha256="05j96ch20nca4dci25w0m9y8l6yhm26fapkmm4rfqg6si8agr52s"; depends=[moments]; };
   emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; };
   emld = derive2 { name="emld"; version="0.3.0"; sha256="16f1za636bbdp9y5mq40n2v77l2zbmwrph870wm12rmn7cjl9bwq"; depends=[jsonld jsonlite xml2 yaml]; };
   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.4.3.01"; sha256="16v5j31516nbqnj2zhgqvyp5yxd4zcs5zi0aspa5plr2qikvrkmg"; depends=[estimability mvtnorm numDeriv 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]; };
+  emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; 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=[]; };
   empichar = derive2 { name="empichar"; version="1.0.0"; sha256="1hcl6wbf4saxxp54j2w67csv6nzfgc3f3wdd9lk9grmkxsaab4rx"; depends=[Rcpp RcppArmadillo]; };
@@ -7269,29 +7275,29 @@ in with self; {
   emuR = derive2 { name="emuR"; version="2.0.4"; sha256="152lg7sf98a7qrblz1ryjdpsprk2arfzwlq8z7b4ilr771lq0plw"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; 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.1"; sha256="0lx159hj464i9libaa3qy96avdwq220333h7pbdh94xz6jrn7k73"; depends=[]; };
+  enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; };
   encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; };
   encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
   endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; };
   endtoend = derive2 { name="endtoend"; version="2.29"; sha256="0dqzh2blb2h8ngchvfvnzx0gmilvx9ydvzqwfy4d9f58ixybn4d9"; depends=[ggplot2 pastecs]; };
-  energy = derive2 { name="energy"; version="1.7-6"; sha256="16m8bxfgr9sdisjy2qrv6fv5xxwcc9q890l0hpbwq6qzisrdn3lh"; depends=[boot Rcpp]; };
+  energy = derive2 { name="energy"; version="1.7-7"; sha256="13wnx5nwk7nsv7vf5sxhz4y0rxrnzm76ldgywk1bxrz67srqzf37"; depends=[boot Rcpp]; };
   energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; };
   enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; };
-  english = derive2 { name="english"; version="1.2-3"; sha256="1gyj3wzx9spibmly7blw2i3gx9gvy22iy8js4r9gn8d3hpv4yf98"; depends=[]; };
+  english = derive2 { name="english"; version="1.2-4"; sha256="0qxrkcj65v000qi63awiak8qyqghf06b1g0f2b6gjl9ilsdkgcb6"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
   enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
   enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
-  enrichwith = derive2 { name="enrichwith"; version="0.3"; sha256="0nc8cdzz9x39kl821qpqg4b0rcs3a1vs75wivlcxcq5zlmdlpb9x"; depends=[]; };
+  enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; };
   ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; };
   ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; };
   ensemblepp = derive2 { name="ensemblepp"; version="1.0-0"; sha256="08k7v61p2sgr07dklabl0g7apsn9da60sfb14gfrwipwi8bsd4pv"; depends=[]; };
   ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
-  entropart = derive2 { name="entropart"; version="1.6-1"; sha256="0cc40xf2lf2vxxnamn26fkrch9lmpbqm4am743yq7bmprfbn4cc4"; depends=[ade4 ape EntropyEstimation geiger ggplot2 ggpubr reshape2 vegan]; };
+  entropart = derive2 { name="entropart"; version="1.6-3"; sha256="06g2fig1adyxaqz2w32343qlj95xgxx63giyggbri60sjf9fck65"; depends=[ade4 ape EntropyEstimation geiger ggplot2 ggpubr reshape2 SPECIES vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   entrymodels = derive2 { name="entrymodels"; version="0.1.0"; sha256="0clyv5ws5nnnyys596zbmdndds43xrvnnkbdk59kj3wscw0hq982"; depends=[dplyr magrittr readr]; };
   envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; };
@@ -7308,7 +7314,6 @@ in with self; {
   eoffice = derive2 { name="eoffice"; version="0.1.8"; sha256="03yjw8yy3x81hnisiznx2gch4flhp7b9vafavx2r8ny86mqya1k9"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify gplots htmlwidgets magick magrittr officer plotly R_devices rvg tibble]; };
   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.3.2"; sha256="0j64riiy7b2v1m8ki6d43jm61s7yjwlx4kxxdvlz3fx1xw7qf522"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; };
   eph = derive2 { name="eph"; version="0.2.0"; sha256="0j41hmiw59q9mwzsw94s0m0hrh4fqhbmayqbblfizh7gr7wijz53"; depends=[assertthat attempt curl dplyr expss glue janitor magrittr purrr questionr readr readxl stringr tibble tidyr tidyverse zoo]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; };
@@ -7329,7 +7334,7 @@ in with self; {
   epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; };
   epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; };
   epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; };
-  eplusr = derive2 { name="eplusr"; version="0.10.4"; sha256="1ls3ixsmkqw4wbxbym8hdxkwqr273ji5krafq4mnw51ksn5f25b5"; depends=[callr cli crayon data_table later lubridate processx progress R6 RSQLite stringi units]; };
+  eplusr = derive2 { name="eplusr"; version="0.11.0"; sha256="081qxdr2yhb3yyjgrxd94f11izlxv6x9s9ka1ms1wqhip8gkvssi"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; };
   eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
   epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; };
   epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; };
@@ -7337,7 +7342,7 @@ in with self; {
   epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; };
   epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; };
   epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; };
-  eq5d = derive2 { name="eq5d"; version="0.4.0"; sha256="1zjdhxcq2slb31kf6sqjbzcrihkaxn37g4yf8lwcnffzaykz4kpg"; depends=[]; };
+  eq5d = derive2 { name="eq5d"; version="0.5.0"; sha256="0h5vrrl1kgq1kp1xli8safp6iig526ib0lz1hs067awkvxnka5yn"; depends=[]; };
   eqn2svg = derive2 { name="eqn2svg"; version="0.1.0"; sha256="01hqmhjy62ic28jsx8zn0zg87pipxmd82795pj66661qkq306lb0"; depends=[htmltools magrittr]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
@@ -7361,7 +7366,6 @@ in with self; {
   ergm_rank = derive2 { name="ergm.rank"; version="1.2.0"; sha256="1vc96rjsqvs6ybnzkpv12h0hsrx2s96k4hjilzjpjnhbazh5vynz"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
-  erhcv = derive2 { name="erhcv"; version="0.1.4"; sha256="0dai1pd9cly8k7k3ygw10hhzz9vs889hab8zf5j1av033lm3cw2j"; depends=[data_tree Rdpack stringi stringr]; };
   erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; };
@@ -7369,34 +7373,34 @@ in with self; {
   errorist = derive2 { name="errorist"; version="0.0.2"; sha256="061v8z11sgzbhzcnyixfv9ff0vhiszjh0dy1rvzbyjsvjzmdimq0"; depends=[searcher]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
   errorlocate = derive2 { name="errorlocate"; version="0.2.0"; sha256="0lm0fp7b4ggx744b7kymman813rqw18qr7pd8r3j52spy3kq90lk"; depends=[lpSolveAPI validate]; };
-  errors = derive2 { name="errors"; version="0.3.2"; sha256="1079jiv323r19paycwmnr9qirh4z0hv22qqmciy2afqpyw5diqh2"; depends=[]; };
+  errors = derive2 { name="errors"; version="0.3.3"; sha256="037spyvw4rm2fcsq7a53svljlsgssrzrshyq01fnky0kq3z0iqqm"; depends=[]; };
   es_dif = derive2 { name="es.dif"; version="1.0.1"; sha256="0cpncj68dhqfcpw7fjqc23d84rq767hqpw6la6iszfrrc27bx4lw"; depends=[]; };
   esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; };
   esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
-  esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
+  esaddle = derive2 { name="esaddle"; version="0.0.6"; sha256="0i89yid4zryc95aj8n512wj3cs5nx351w4rc1nghq5a7vp139fa7"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
   esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; };
-  esc = derive2 { name="esc"; version="0.5.0"; sha256="1n47zpl8blz09fsjzpxp3f6yfnhz5vpd3h30sjxqgi4h1zw4lbml"; depends=[]; };
-  eseis = derive2 { name="eseis"; version="0.4.0"; sha256="023j91j5s5b84gcgi6i9gs7ky1f8ncimlx2c5s6w37kh13nfhcby"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp rgdal rmarkdown signal sp XML]; };
+  esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; };
+  eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; };
   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.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; };
-  esquisse = derive2 { name="esquisse"; version="0.2.2"; sha256="1k18lrg5417s1mjm01m6nn81w959naybdqj74zrr8gbphlk8s4xx"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; };
+  esquisse = derive2 { name="esquisse"; version="0.2.3"; sha256="0xx9d4xhcbbjc5nzwq0azhilkkn2q0q3xl1nbidj10c9f3ma699j"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; };
   esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; };
   essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; };
-  essurvey = derive2 { name="essurvey"; version="1.0.4"; sha256="0y7acy5k3whz2xq3gyqds13n8yb8i8r1a34s9pjzsy6s3gw5rys3"; depends=[haven httr rvest tibble xml2]; };
+  essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble 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.20.0"; sha256="0mrx14chg9qb90hlivn90l1jv9la4n1bkznbdx58ghli73k8dvdz"; depends=[Formula generics Rcpp RcppEigen rlang]; };
   estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; };
   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.9.0"; sha256="0cx065vix8y1560ipz5hpbk49b3ksvnv0mxlws2vqvsv995rr88c"; depends=[matrixStats quantmod Rcpp zoo]; };
+  estudy2 = derive2 { name="estudy2"; version="0.9.1"; sha256="1hc90jcnbb69f8p5h2vv6qlnx2n1pzdpbk4xcqw6mi7472dsmz7l"; 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.5"; sha256="03skydbw4ch0lhhlm57qgg4q0vyd4rwzsq3v2w40jrczpxpdsn9q"; depends=[dplyr httr jsonlite Rmpfr]; };
   ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.6"; sha256="1v1vsj1nzmgji6kzgfkdmy08ajn8iag4jzw0lwh81b3vmdx8f4g2"; depends=[circlize cowplot dplyr ggplot2 magrittr reshape]; };
-  etl = derive2 { name="etl"; version="0.3.7"; sha256="045hkh95ki3s10l9mz4710ws2i9and4rqb0qk1c5sfslglc0riq5"; depends=[DBI downloader dplyr lubridate readr rlang rvest stringr tibble xml2]; };
+  etl = derive2 { name="etl"; version="0.3.8"; sha256="19m1sp3ryqb1gw7i9lh8dpmwbgy0c0dpsivj27wkr36bdhfvrfls"; depends=[DBI downloader dplyr janitor lubridate readr rlang rvest stringr tibble usethis xml2]; };
   etm = derive2 { name="etm"; version="1.0.5"; sha256="1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677"; 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=[]; };
@@ -7405,19 +7409,20 @@ in with self; {
   eulerr = derive2 { name="eulerr"; version="6.0.0"; sha256="0pvyg91xamhmz4k1b18g96imkddk64d6dadg74v1mnbzjiq742wh"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; };
   europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="3.3.55"; sha256="1i66m6hamrq54209vcmp1y13lwfx1bykm1fggrv54nyxijikbjs7"; depends=[broom classInt countrycode dplyr httr jsonlite RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; };
+  eurostat = derive2 { name="eurostat"; version="3.4.20002"; sha256="04pzn47hnjglm30f06d9iv4agapgmxr761fvbzspj6siw5yzp77g"; depends=[broom classInt countrycode curl dplyr httr jsonlite RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; };
   ev_trawl = derive2 { name="ev.trawl"; version="0.1.0"; sha256="14yhnhqq1gz2rfy13v1dybnf55pyyimajbarxyp7gaqnd66nfq3p"; depends=[eva evir fExtremes ghyp hypergeo testthat]; };
   eva = derive2 { name="eva"; version="0.2.5"; sha256="03hyzbqi2mgdrmzrjnwzvy0ndf7ha5959b63sgd1g0b998fibbmd"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; };
   evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs 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]; };
+  evclust = derive2 { name="evclust"; version="1.1.0"; sha256="06w1spqz5gidycwzwf51414iy182bc1ncis7m4bwx6a268vrznnx"; depends=[FNN limSolve Matrix mclust plyr quadprog R_utils]; };
   evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; };
   evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
   event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; };
   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=[]; };
+  eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; };
   evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; 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]; };
@@ -7435,9 +7440,9 @@ in with self; {
   exPrior = derive2 { name="exPrior"; version="1.0.1"; sha256="05z7dx1qfwcagadlw8wrf30071ssawv8njm2q6jaa4r4in0i5l1s"; depends=[coda ggplot2 gtable nimble plyr reshape2]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.6.3.1"; sha256="0yl0ylgk83w076vbda7yfdvfbwwhhcp89bcv3i6418rz8y7k1ili"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
-  exactRankTests = derive2 { name="exactRankTests"; version="0.8-30"; sha256="02lqs5pw9vii398jz8yr55jk8158xxxqrk1bf55b08xcccxdwrff"; depends=[]; };
+  exactRankTests = derive2 { name="exactRankTests"; version="0.8-31"; sha256="1154dkcid3njhamdp87qs9bnx7l8bdqkcjsds9q9f2xmizs9x8gw"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
-  exactextractr = derive2 { name="exactextractr"; version="0.1.1"; sha256="0jazvagfy9m68f0z3imvs9vdbmviybssiw7vzragxy85m4dgkvzm"; depends=[raster Rcpp sf]; };
+  exactextractr = derive2 { name="exactextractr"; version="0.1.2"; sha256="18f01431cs4dziq3x77pni7axvmnh2hnvs97jh9sbanjdx6iqvj2"; depends=[raster Rcpp sf]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
   exampletestr = derive2 { name="exampletestr"; version="1.5.2"; sha256="0lfhgjirsl2b1vksjfrw3wlvw6x34d20vldh313qkjrg2yihpk1q"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; };
   exams = derive2 { name="exams"; version="2.3-4"; sha256="1sa76qnzf7llj97xc41l2s8n4fqlg1wcvyq9sq59f1blfwxcnnd7"; depends=[]; };
@@ -7455,9 +7460,9 @@ in with self; {
   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.2.0"; sha256="0f8h4pj2y7cd2s1q44q4mrg9cirnpz0bkn4xm04hz1rpjxb4xlv1"; 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=[]; };
+  expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; };
   explor = derive2 { name="explor"; version="0.3.5"; sha256="1v3z067w5kskwr0wmrr26m3yfsmg9pf17ma9ck2srgyxqmddc0sj"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; };
-  explore = derive2 { name="explore"; version="0.5.2"; sha256="1j3izj31595wcmv85hkdlyhgbm4cydr44c6vgjjacbmawxc2zm8r"; depends=[broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr]; };
+  explore = derive2 { name="explore"; version="0.5.3"; sha256="0fji8klf2wxrkyp1vdlcvj8i0b9c4c68qvsakbm45fnyz20q3v4a"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
   expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; };
   export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; };
@@ -7470,6 +7475,7 @@ in with self; {
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
+  extRC = derive2 { name="extRC"; version="1.0"; sha256="1cawfkd98n70y54qg8i2h82xrrgygr48sq31yzx9hllkx33pk97d"; depends=[MASS]; };
   extRemes = derive2 { name="extRemes"; version="2.0-11"; sha256="0hmgynxhzswqnhwb2sxrkczgam8c17s3vpxqc5bcz0bwczpxxyvm"; depends=[distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
   extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; };
@@ -7494,11 +7500,12 @@ in with self; {
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
   ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
-  ezCutoffs = derive2 { name="ezCutoffs"; version="1.0.0"; sha256="0awi63f4hk35gd55w7axshlyb1vpwb64sw5y3733ag5cbgk30jkz"; depends=[doSNOW foreach ggplot2 lavaan moments progress]; };
-  ezcox = derive2 { name="ezcox"; version="0.2.0"; sha256="0ymvy17yzbzq7g9d8hk30pi3hvsmvxiym9v3j5ivpvy679j3w0iw"; depends=[dplyr magrittr purrr rlang survival]; };
+  ezCutoffs = derive2 { name="ezCutoffs"; version="1.0.1"; sha256="04ah9dbfwl89xi0di0dslaf8a39nynxymm8lbacgd88al5dg7y1n"; depends=[doSNOW foreach ggplot2 lavaan moments progress]; };
+  ezcox = derive2 { name="ezcox"; version="0.4.0"; sha256="1cfrcgzp8qkih0x2djbs3hlsgr0wkdvqvy71pcqn2zxlim0r5xvv"; depends=[dplyr forestmodel magrittr purrr rlang survival]; };
   ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
   ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
+  ezmmek = derive2 { name="ezmmek"; version="0.2.1"; sha256="06cjp0hbq4blg7jj0jzp372xi1vgd1nwp27nzfsbchszn3j85lgf"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr scales tidyr]; };
   ezpickr = derive2 { name="ezpickr"; version="2.0.0"; sha256="1x7v7zsr8hjrwi48dkryqryp607550gs77b058qcdgcdznlqwzp2"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble vroom writexl]; };
   ezplot = derive2 { name="ezplot"; version="0.3.1"; sha256="1cs5i3ik6q6s30z8nh6ckc68vcqkf1hnzy3wn6d0rypmny7jkfkc"; depends=[dplyr forcats ggplot2 rlang]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
@@ -7527,15 +7534,15 @@ in with self; {
   fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; };
   fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
-  fabMix = derive2 { name="fabMix"; version="4.5"; sha256="0d396a3ns3h2p4rdi45xcs3rfb18aqd95n8dszgdh8snf1776b9r"; depends=[coda corrplot doParallel doRNG foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; };
-  fable = derive2 { name="fable"; version="0.1.0"; sha256="1gv5dlvqm7fwp4az9qy3zr8g3cw1zlqfal3m8c20agw3966z011j"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; };
+  fabMix = derive2 { name="fabMix"; version="4.6"; sha256="1xh3x9qbg61jgm80s2qrx43b55vmiam1i8mciijax8ipf56pk6j7"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; };
+  fable = derive2 { name="fable"; version="0.1.1"; sha256="1h71slynwfsmv59yf7mm3gk3i56c5ggk3sd44fm83yhvv6080w3m"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; };
   fabletools = derive2 { name="fabletools"; version="0.1.1"; sha256="0cbiqd7cx4kws9lhwydrjlcxcm46vl6srslzw1h5ljfmgjkvkf8p"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble]; };
   fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; };
   face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; };
   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]; };
   facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; };
-  factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
+  factoextra = derive2 { name="factoextra"; version="1.0.6"; sha256="0bpsbcmp6jpa9qk53dhfzghrz98dh0h0n68brl7rjz724yjbvhn8"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
   factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; };
   factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
@@ -7545,6 +7552,7 @@ in with self; {
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
   factorstochvol = derive2 { name="factorstochvol"; version="0.9.3"; sha256="15gamzznss9vfmbvbk61sgabxfsra2i49bs142jl1ahk7wchiskw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; };
   factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; };
+  factset_protobuf_stach = derive2 { name="factset.protobuf.stach"; version="1.0.2"; sha256="0qdvgq0w58pb0bn4x5v25i8pvij3lc8l9x9bj68s9zb29ankl3ss"; depends=[R6 RProtoBuf]; };
   factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; };
   fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; };
   fairadapt = derive2 { name="fairadapt"; version="0.1.0"; sha256="01ing7mm1asfgh4w8cc7f7fpv13lja97vv5skk5bri00zycwcqfd"; depends=[ranger]; };
@@ -7560,14 +7568,15 @@ in with self; {
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
   fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
   fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; };
-  fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
-  fansi = derive2 { name="fansi"; version="0.4.0"; sha256="02f2rx7v7wz6w97m2slwky2i5y8f9iafycmkyr3siy3z3k8fj171"; depends=[]; };
+  fanplot = derive2 { name="fanplot"; version="3.4.2"; sha256="169n9ghm4x6fhd97xz1mqjj0f5hldjkrp926iqk2qqanchnhfvh6"; depends=[]; };
+  fansi = derive2 { name="fansi"; version="0.4.1"; sha256="028ywjy538psnmdnddvy5jr3idzffr4hikzr4x97x0m30g4fws9w"; 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.1"; sha256="0d3d343jjjwsb132ph12h3r044j3bc4jp94ayikjyq1lmwwsfr4k"; depends=[BBmisc checkmate readr stringi]; };
-  farver = derive2 { name="farver"; version="2.0.1"; sha256="0aq1hk561pz3s3lpay1adwsihha6mxp7zbj4n1m6307g34awlhhn"; depends=[]; };
+  farver = derive2 { name="farver"; version="2.0.3"; sha256="1k75v07dsfkjra2gsgxg9s55cw3b46b1nh960kqphq7cg7gr058f"; depends=[]; };
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
+  fasstr = derive2 { name="fasstr"; version="0.3.1"; sha256="1msafxyx2xwgjw87yfbqqfn5ajfc6gla2nf41s6g4wjzg245n5zn"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; };
   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.6.0"; sha256="0fkmc1kr11vf3pikj5is5951dx79705c7djfvg7bsbbvpvll0crj"; depends=[data_table tibble]; };
@@ -7599,13 +7608,15 @@ in with self; {
   fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
   fastmap = derive2 { name="fastmap"; version="1.0.1"; sha256="1v7sp56xiha0bh78g3w92k52p9vkp7ryzpw0z66nyddxzrfv0y27"; depends=[]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
+  fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; };
   fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; };
+  fastpos = derive2 { name="fastpos"; version="0.2.0"; sha256="117b2hi1x9qh9q39sdwg9g69r70axivwyb8qs1jk2yrfh9fbrz2k"; depends=[MASS plyr Rcpp RcppArmadillo RcppProgress]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
   fastrtext = derive2 { name="fastrtext"; version="0.3.4"; sha256="0k38290pz92ysw57298nng7bbghf5cicvin7l9q6l89pk3qa5wp0"; depends=[assertthat Rcpp]; };
-  fastshap = derive2 { name="fastshap"; version="0.0.2"; sha256="1nf3aslcrysi6s4i13qjldal8ghqbpj1fcx8vh5yaqwi7snnj3k1"; depends=[ggplot2 gridExtra plyr Rcpp RcppArmadillo tibble]; };
+  fastshap = derive2 { name="fastshap"; version="0.0.3"; sha256="0xjwdwi6r8mpjzzf72bf13waf3pbjlrmbn4v8z8b6j35bdx76ij8"; depends=[ggplot2 gridExtra plyr Rcpp RcppArmadillo tibble]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
-  fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.3"; sha256="00pnzr3v7vm965b3cvgplasw00akmixybvm6l9bn609c2kqbf5p3"; depends=[kinship2 multgee]; };
+  fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; };
   fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; };
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
@@ -7614,6 +7625,7 @@ in with self; {
   fbati = derive2 { name="fbati"; version="1.0-3"; sha256="03a48sndphxrm4bmk0qx0lxnk4akkdpbvldq9dcnf9hxxmrfivh4"; depends=[fgui pbatR rootSolve]; };
   fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; };
   fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; };
+  fcaR = derive2 { name="fcaR"; version="1.0.3"; sha256="0ljvn4sa3a2x1pskv2jil1c67rnd61dgi8cx1rq600mrsb2pdlhj"; depends=[arules hasseDiagram knitr Matrix RColorBrewer Rcpp scales stringr tictoc]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
   fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; depends=[MASS Rcpp RcppArmadillo]; };
   fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
@@ -7622,24 +7634,24 @@ in with self; {
   fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
   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="2.0.0"; sha256="02ji65wq7kn6isl9nbiwh52vximd52sfg22mnc00vkqxdkrb9s8c"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; };
+  fda_usc = derive2 { name="fda.usc"; version="2.0.1"; sha256="0ii00vv4c4cvswd5vs82a1j7gbxl328bjxdk39r1xcd26iz94vlb"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; };
-  fdaPDE = derive2 { name="fdaPDE"; version="0.1-6"; sha256="0vi5mjmyrj2slzmvnkpnrlw67na7470ka97q9vadcjiwvfc6kv7c"; depends=[RcppEigen rgl]; };
-  fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; };
+  fdaPDE = derive2 { name="fdaPDE"; version="1.0"; sha256="15x5n48hn151j9h8bnqjyjnaq575mckz6dcb9lxr9zmwidg58gb2"; depends=[geometry Matrix plot3D plot3Drgl RcppEigen rgl]; };
+  fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
   fdapace = derive2 { name="fdapace"; version="0.5.1"; sha256="0i9y9vz676jspanbbrfbygyq5bxplcv4c5q4yql1y0r8zkg4xq2z"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
   fdasrvf = derive2 { name="fdasrvf"; version="1.9.2"; sha256="0hdxpin1ydc9sl9wp5axn6sj2mwlhndxya92ss1i8lj1cxmlz42d"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance 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]; };
   fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; };
-  fdm2id = derive2 { name="fdm2id"; version="0.9.0"; sha256="0mdqgq6jff1dnnnyhlh0fhdnir88b49aqzaph38f2k57fliaydq8"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR NMF nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; };
+  fdm2id = derive2 { name="fdm2id"; version="0.9.1"; sha256="0dnjhrwwk5lqb2niqakp4fi7k8jgzdzaw62bbrqp3y409m49kcy9"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR NMF nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; };
   fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
   fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; };
   fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; };
   fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
   fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
-  feasts = derive2 { name="feasts"; version="0.1.1"; sha256="0jzl2rqzdfdn2z5azpwhz6gllg0wkq6afdlllpiysfg7vfm6w51n"; depends=[dplyr fabletools ggplot2 rlang scales tibble tidyr tsibble]; };
+  feasts = derive2 { name="feasts"; version="0.1.2"; sha256="139ra1dgh6zy862gyr2w2agdrhplhh3rv7zv8k5vhi06sm59zggs"; depends=[dplyr fabletools ggplot2 lubridate rlang scales tibble tidyr tsibble]; };
   feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
   featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; };
@@ -7653,7 +7665,7 @@ in with self; {
   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]; };
   feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; };
-  felp = derive2 { name="felp"; version="0.2.1"; sha256="1whcpwg91qjdnqcjm4jyb82n4xf690jvqbv0wcrf90ycyinl7qvr"; depends=[prettycode]; };
+  felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; };
   fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; };
   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=[]; };
@@ -7687,20 +7699,19 @@ in with self; {
   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="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; };
   filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
   fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; };
   finalfit = derive2 { name="finalfit"; version="0.9.7"; sha256="1y1fllbrqy4q79w4l3830aqlf32v4clfzajqnwiylxwxw71v7yaa"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr scales stringr survival survminer tibble tidyr]; };
-  finbif = derive2 { name="finbif"; version="0.1.0"; sha256="1bvic9nbqz3qs24ldf1zsqfijvw3jl8frbm8pyxn8cpgdgkj9kq1"; depends=[digest httr jsonlite lubridate lutz]; };
+  finbif = derive2 { name="finbif"; version="0.2.0"; sha256="1wb4hl5j2g3fgapd7x8jl2180s48p51nngyb8zvs7jacl32a04bh"; depends=[digest httr jsonlite lubridate lutz]; };
   finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; 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.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
-  fingertipsR = derive2 { name="fingertipsR"; version="0.2.9"; sha256="03zj7qqh3yzsvw3a36c8jfci9fz4n0ylzzvlw3dlsi9637xcc9pz"; depends=[curl dplyr DT httr jsonlite miniUI readr shiny shinycssloaders]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="1.0.0"; sha256="0hk2qlq7saqxlkd3yh4vq3s9cwcrjs65dwzhcglz5296w90dyscl"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; };
   fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.10"; sha256="1l3mirspz28djlzma04lkkynfbz8qfq0asr662q102j31qx6vnm4"; depends=[curl dplyr geojsonio ggplot2 httr 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]; };
@@ -7710,15 +7721,15 @@ in with self; {
   fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
   fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; };
-  fishmethods = derive2 { name="fishmethods"; version="1.11-0"; sha256="0ikxvq0mkw0s382ias04il06sbqfiq8phx69f5pdzvbm5xskzmxs"; depends=[boot bootstrap lme4 MASS numDeriv]; };
+  fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; };
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
-  fishtree = derive2 { name="fishtree"; version="0.3.1"; sha256="17iqwgh2ap4mjx7i4bwdbhzp3qlwwb4rr4zw0kg26va8rl3ycphn"; depends=[ape jsonlite memoise rlang]; };
+  fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; };
   fishualize = derive2 { name="fishualize"; version="0.1.0"; sha256="17ywlnjq1digkc73r9bc0czdwh7f3sp8lzbh53rx99dad7bpm9kd"; depends=[ggplot2 gridExtra png]; };
   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=[]; };
-  fitHeavyTail = derive2 { name="fitHeavyTail"; version="0.1.1"; sha256="1smziqinv0ls33rchihn9r7x0sirm1ix9zmji8zkw59bpqp4ml94"; depends=[ICSNP mvtnorm]; };
-  fitODBOD = derive2 { name="fitODBOD"; version="1.4.1"; sha256="06yqp95k13d5zy4md12aqlk8yjk9g7hnnizjzksx46sh6rsn82aw"; depends=[bbmle hypergeo]; };
+  fitHeavyTail = derive2 { name="fitHeavyTail"; version="0.1.2"; sha256="17jdqxrycqkpmb9pzfqrwcax12j6dx7w122989qrpwqsx48ax133"; depends=[ICSNP mvtnorm]; };
+  fitODBOD = derive2 { name="fitODBOD"; version="1.4.1-1"; sha256="0sx7la3bcii8fh8ril5ibbr4x97zgqwl7h889gnk6j733pcmgx0p"; depends=[bbmle 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]; };
@@ -7727,7 +7738,7 @@ in with self; {
   fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; };
   fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; };
   fitur = derive2 { name="fitur"; version="0.6.1"; sha256="04lr717lsbb4731nlzgscraj30knik4q68jzrl4i5f27912159r9"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; };
-  fitzRoy = derive2 { name="fitzRoy"; version="0.2.0"; sha256="0c317bibl5az8ak29p0bfznldy1kda433mmxqrr7mc6fv0rd3jh3"; depends=[dplyr glue httr jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble tidyr tidyselect xml2]; };
+  fitzRoy = derive2 { name="fitzRoy"; version="0.3.1"; sha256="0f39mn36mv7s0lidz93a7ri13sbr1lxnc6m7pgrkwk11yd61kf9g"; depends=[dplyr glue httr jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble tidyr tidyselect xml2]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; };
@@ -7741,7 +7752,7 @@ in with self; {
   flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
-  flashlight = derive2 { name="flashlight"; version="0.4.0"; sha256="0p44my7786pr0mxncawf607dv696sg9cag201f1c3m75a1zsb4yy"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang tidyr]; };
+  flashlight = derive2 { name="flashlight"; version="0.6.0"; sha256="11ihz72kq77asg6lk2yfasxb99z4ixpddklvs26fglss58p24041"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang tidyr]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
   flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
@@ -7750,7 +7761,7 @@ in with self; {
   flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
   flexmix = derive2 { name="flexmix"; version="2.3-15"; sha256="0hrz2axp2c9548b1r0bmrl57219nn030qndb83a8garkzq5lqi5s"; depends=[lattice modeltools nnet]; };
   flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; };
-  flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
+  flexrsurv = derive2 { name="flexrsurv"; version="1.4.4"; sha256="08xhanbrd4pfm014ydh8dz6dpm6xw7qjdq0wr2flld04924yv9p8"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; };
   flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; };
   flextable = derive2 { name="flextable"; version="0.5.6"; sha256="1f869f2dfqkzhf6yix7xcbs8rn1nwq3sg623h74zg6h1pl6px66w"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; };
@@ -7775,14 +7786,14 @@ in with self; {
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
   fluxweb = derive2 { name="fluxweb"; version="0.2.0"; sha256="1ssq90fqm4p0j4g171mx208lmgz3hkxs8hgsffkawpmxgacs0gh1"; depends=[]; };
   flyio = derive2 { name="flyio"; version="0.1.4"; sha256="1mrv5gvsr4zbh8bghrrizgrqz1cqn4pl3gizr77jl9mlxxpmhx20"; depends=[assertthat aws_s3 googleCloudStorageR stringr]; };
-  fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
+  fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
   fmri = derive2 { name="fmri"; version="1.9.2.1"; sha256="0ij6j3hk3rb2vinhh2jxac085qd258zr4jk60difh5krsk9kksyc"; depends=[aws awsMethods metafor nlme]; };
   fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; };
   fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; };
-  fmsb = derive2 { name="fmsb"; version="0.6.3"; sha256="1n29bnyp20pvpk2lsa9fblsj5w7amp14snc74pk5w3yr5y6rj0s5"; depends=[]; };
+  fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; };
   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.1.4"; sha256="1nxz41yhlg28jdihixy2w44nfvaliyfmxibxk58j7hfgyyvlm21s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
@@ -7799,18 +7810,19 @@ in with self; {
   foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
   forcats = derive2 { name="forcats"; version="0.4.0"; sha256="1cnjh23z59fhbjmy7y95425hcq3m5wrwqvahsxwi7zm6d9bwp0vw"; depends=[ellipsis magrittr rlang tibble]; };
-  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.8"; sha256="1kpk8p50xq3jrmapqyf56a5lnxkdvlafp5709wvqxq9rnsslpv2g"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
+  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.81"; sha256="1p3w5cs52ph79p2l78apvibr82w7sfbwf8436jfbb4gcahjhmrnk"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.7"; sha256="0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="8.9"; sha256="013xnpj3czcjkwqyzjjjhgy9nd56lwvh6y05ys2lndvcy4vyrqxd"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
+  forecast = derive2 { name="forecast"; version="8.10"; sha256="0jccr2wg7sii38lyqrs58fkxf2az7nw6v0jya27hpbz9bg8ib3kr"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
   forecastHybrid = derive2 { name="forecastHybrid"; version="4.2.17"; sha256="1k3jwxqwkprcf2qr5x1b8hzzdvbyzdiablpvqnr0482x4vza8lmc"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; };
-  forecastML = derive2 { name="forecastML"; version="0.6.0"; sha256="1jq6dlm9ix81nx61nphg2fzmf1jmlqirhpjnxx8qyhb8gx3jiply"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tidyr]; };
+  forecastML = derive2 { name="forecastML"; version="0.7.0"; sha256="00zxwdv6nsm8fzizv1gqm682kpr7cnp0j49ihziayp7i9il4wa6k"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tidyr]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; };
-  foreign = derive2 { name="foreign"; version="0.8-72"; sha256="124c9229is44p2rv7xyh2q86nsfi7vzyyh5n3c5ihziqrp4ig723"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-75"; sha256="0g4mi101srjbl17ydb2hl3854m3xj0llj6861lfr30sp08nkqavl"; 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]; };
   forestChange = derive2 { name="forestChange"; version="0.6"; sha256="13zzng022m1jhca0d2w868kqp9h0wfpjmh0xnlb8jl1l4vfc68r9"; depends=[curl raster rgdal rvest SDMTools xml2]; };
   forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; };
+  forestError = derive2 { name="forestError"; version="0.1.0"; sha256="1pmrhzcqywm0qj6csiywfavf5vc6qg66j5qgfhd6yk7h9nvd5gnm"; depends=[doParallel foreach Rcpp]; };
   forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; };
   forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; };
   forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; };
@@ -7819,16 +7831,14 @@ in with self; {
   forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang 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.9"; sha256="1vcma7dvlvyhz6n25pj19h70i8xmz6vibkf945qkmj5hhrb7zxia"; depends=[checkmate magrittr]; };
-  forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; };
   foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; };
   forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; };
   formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; 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]; };
-  formulaic = derive2 { name="formulaic"; version="0.0.4"; sha256="1y5v6zwyzcba3zn8xzn9q94v5cwnkcr406xp3kmj9igxgb24ff0m"; depends=[data_table DT]; };
-  formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
+  formulaic = derive2 { name="formulaic"; version="0.0.6"; sha256="020sbchj445kwwfj17ixmhsgl38qpwb723r6r8pbc6b3q0zw4b3d"; depends=[data_table DT]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
-  forward = derive2 { name="forward"; version="1.0.4"; sha256="0qhssp8mymy5wgzfkp1xa8s81j803g0ckg647ind6ms26320hq0x"; depends=[MASS]; };
+  forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; };
   forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; };
@@ -7836,7 +7846,7 @@ in with self; {
   fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; };
   fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; };
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
-  fpc = derive2 { name="fpc"; version="2.2-3"; sha256="1dy3pla4jjgs46izqg2kxajlxr80sbr9896jbzb1qszrdx7af041"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; };
+  fpc = derive2 { name="fpc"; version="2.2-4"; sha256="1gsnl5sbdg86b2wdrsy6wq83xj6mrziiq7rxa8cqksgljc7gp6yf"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; };
   fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; };
@@ -7848,7 +7858,7 @@ in with self; {
   fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; };
   fpp3 = derive2 { name="fpp3"; version="0.1"; sha256="17j5y1y46dn21049rfiwr7j0f5q2kc6jvxdpw252l063dqdb9pd9"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
-  fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
+  fracdiff = derive2 { name="fracdiff"; version="1.5-0"; sha256="0f735pb94xxmnqypfd5zi3qmlqg7m10z20g2cbqq71aa0y22cbvr"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; };
   fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; };
   fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
@@ -7858,19 +7868,19 @@ in with self; {
   frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
   frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="3.0.3.2"; sha256="0kwp7z5m73nx6jcgh6j76lmirpzh2kz3yirwn4iii9qkccrh6jps"; depends=[boot doBy MASS nlme statmod survC1 survival]; };
+  frailtypack = derive2 { name="frailtypack"; version="3.1.0"; sha256="1x6i3kc8xl2dfmbljki94ivkh2hlkisq5hmxzk48i4288hrl2jcn"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes 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.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; };
   frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; };
-  frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
+  frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; };
   fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; };
   freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; };
   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.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; };
-  freesurferformats = derive2 { name="freesurferformats"; version="0.1.6"; sha256="17lxy8b4xz7g3anmr2wv70idw37gmlh6cf95k7krqmrrm5a3i369"; depends=[pkgfilecache]; };
+  freesurferformats = derive2 { name="freesurferformats"; version="0.1.7"; sha256="0451m10kcn8zngsv8nfz9na7pw7apf15zxdp9ny63plfs063340z"; depends=[pkgfilecache]; };
   freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; };
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
   freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; };
@@ -7885,7 +7895,7 @@ in with self; {
   frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; };
   frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; };
   fromo = derive2 { name="fromo"; version="0.2.1"; sha256="0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm"; depends=[Rcpp]; };
-  frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; };
+  frontier = derive2 { name="frontier"; version="1.1-6"; sha256="18qxzzhmxbwnflb90pls5d4kmijg0rhpsmnnysvmmppm8h6nf7nf"; depends=[Formula lmtest micEcon miscTools moments plm]; };
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; };
   frostr = derive2 { name="frostr"; version="0.1.0"; sha256="02ygg5dxpnv72gpwwsarhkl5hk6hldxjqpw875p7hb1ny7khgmfg"; depends=[httr jsonlite tibble tidyr]; };
@@ -7893,10 +7903,11 @@ in with self; {
   fs = derive2 { name="fs"; version="1.3.1"; sha256="1g26rgx13dzigp2vrlld6h28q33lwbax97zvwdrq2pc3iz54v4yn"; depends=[Rcpp]; };
   fsbrain = derive2 { name="fsbrain"; version="0.0.3"; sha256="1s7i9rpazp5s3vnm9y6ajpy06wbd7gjdzr9mbndjnsb9w985957a"; depends=[dplyr fields freesurferformats pkgfilecache reshape rgl squash]; };
   fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; };
-  fsdaR = derive2 { name="fsdaR"; version="0.4-6"; sha256="0lj2kaan5n4g2ckj6d4sfvab0a45h164m1fjvqf57c0ymhaswz76"; depends=[ggplot2 reshape2 rJava rrcov]; };
+  fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
   fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; };
   fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; };
+  fssemR = derive2 { name="fssemR"; version="0.1.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; };
   fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; };
   fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; };
   ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; };
@@ -7909,9 +7920,9 @@ in with self; {
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
   fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; };
   fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; };
-  fulltext = derive2 { name="fulltext"; version="1.3.0"; sha256="1wh120zdv4kfz1ai3zsnk7j6acyhx439hr9aj92j0mzmb3pzxs7j"; depends=[aRxiv crminer crul data_table digest hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
+  fulltext = derive2 { name="fulltext"; version="1.4.0"; sha256="0q6akbq48jklj620k73ff0z5i8kqyrs8bxy75cys5lnxnb0wampq"; depends=[aRxiv crminer crul data_table digest hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; };
   fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; };
-  funData = derive2 { name="funData"; version="1.3-3"; sha256="01aklp1k3k0bhs3dzlcr3phyk27d2nw0b8r154chiix5m67nfhbf"; depends=[abind fields foreach]; };
+  funData = derive2 { name="funData"; version="1.3-4"; sha256="14s86s8ap52qr50cwmiqhkfnnb5ckf9hnmzslfmz44k3ydp9d7hp"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; };
   funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; };
@@ -7921,15 +7932,16 @@ in with self; {
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="1.0.1"; sha256="08r9nyqq83vzaddxcqwf4zilkz935p40vssfn3afs1bkkda5xyya"; depends=[calibrate car cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
-  fungible = derive2 { name="fungible"; version="1.93"; sha256="03v15qf5mlfllx8kb82ajq3lg8pssi20ffkszxbn20y8q4m2rapq"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; };
+  fungible = derive2 { name="fungible"; version="1.95.2"; sha256="031z94a5ayc8sd7vgwj0g1wxzq28mibnr9a0wskgfgvhm80f8pmd"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; };
   funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; };
   funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; };
+  funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; };
   funprog = derive2 { name="funprog"; version="0.1.0"; sha256="1npyijpsbb9n3z8pyvf2pbnf67jlcqw4wl2jm860i3z13j1cnhmn"; depends=[]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
-  funrar = derive2 { name="funrar"; version="1.3.0"; sha256="0bby03hjzcsy2chh7l5170ba12jbid6485nsjxapajv6gdzzpk58"; depends=[cluster dplyr]; };
+  funrar = derive2 { name="funrar"; version="1.3.1"; sha256="1i206awpkc5vvi3aii5kszf57wipqqkqply2xfn0b969fnd0ln6x"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; };
-  furniture = derive2 { name="furniture"; version="1.9.0"; sha256="17cik8r3dbv1a4d17ail7im65s8q2jmyzwiq1cbma7rldszs0x5j"; depends=[cli crayon dplyr forcats knitr magrittr rstudioapi tibble]; };
+  furniture = derive2 { name="furniture"; version="1.9.5"; sha256="1vls4x1nppi1ivra7jyhh9cqixpjf6gixk6hcirqnbb4vr4zww2p"; depends=[crayon dplyr knitr magrittr rstudioapi tibble]; };
   furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; };
   fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; };
   fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
@@ -7940,9 +7952,9 @@ 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.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; };
-  future = derive2 { name="future"; version="1.15.1"; sha256="101hi8warqa0py9l6c5p98f7i9xjhx01w655z6a35jx1dhspykzd"; depends=[digest globals listenv]; };
+  future = derive2 { name="future"; version="1.16.0"; sha256="1xaqh0b2knf5bp23mc0kriq0iqhqna31q3b7d960piqjhzrb03dm"; depends=[digest globals listenv]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; };
-  future_apply = derive2 { name="future.apply"; version="1.3.0"; sha256="0wd3bh114zkvrqlpn8gqz4ix1igr9hr8x72h2g00a7mqkfjfqx33"; depends=[future globals]; };
+  future_apply = derive2 { name="future.apply"; version="1.4.0"; sha256="1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk"; depends=[future globals]; };
   future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; };
   future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
@@ -7972,9 +7984,9 @@ in with self; {
   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.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; };
-  gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
+  gRain = derive2 { name="gRain"; version="1.3-2"; sha256="0b69gv4g5cx2p9jciy3dbixc7cc5ybyz79w21bxzpjxkcqawcp8q"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
-  gRbase = derive2 { name="gRbase"; version="1.8-4.5"; sha256="01mq9c5prkb9vhpp46i369i9a66vc1knh54vk57rb9mndlr8kinv"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
+  gRbase = derive2 { name="gRbase"; version="1.8-5.1"; sha256="04xccgrprzv1hs6v19fiy4fcyp9frsrrsw6nyw1ksh8cx4w681ar"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; };
   gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; };
   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]; };
@@ -7996,20 +8008,19 @@ in with self; {
   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.16.1"; sha256="1fbldshnfy37bpqprazwp1rkyh9f67mr2krnxpl4688mqq143l40"; depends=[foreach]; };
-  gamCopula = derive2 { name="gamCopula"; version="0.0-5"; sha256="08dw2i7h8maymqxr882kdv5938dz08n44969fisj2zya00zsrr4y"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
+  gamCopula = derive2 { name="gamCopula"; version="0.0-6"; sha256="0fz6phhdmk0zd3irki4kj5wkpdjbgxd4svw6pinpk4vg3qwz83jd"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
   gamRR = derive2 { name="gamRR"; version="0.7.0"; sha256="0zn8921a4i1lz5wpdfbd72pqb25r12abyqw7y2w53kfhdzs57f3l"; depends=[boot mgcv]; };
   gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; };
   gamair = derive2 { name="gamair"; version="1.0-2"; sha256="1cjrd576l9md1jb1fc1y6iay5y49i0d8by024qsc7yik6f6mdl13"; depends=[]; };
   gambin = derive2 { name="gambin"; version="2.4.1"; sha256="03n5zcwfq8g1vk5w22hw8fhqkc63zz4g9d3gdxa5g8v7v56l3dqy"; 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]; };
   gameofthrones = derive2 { name="gameofthrones"; version="1.0.0"; sha256="15jgpv197aqb56iyp4afjajx2rcxz21dhigx9mxipa0b8g2h0s6k"; depends=[ggplot2 gridExtra MASS]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
   gamesGA = derive2 { name="gamesGA"; version="1.1.3.6"; sha256="1agvh27m5sy8psbsw9nbi39wl7cf406fl9sd9hkc14139w9drfwv"; depends=[shiny]; };
   gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; };
   gamlss = derive2 { name="gamlss"; version="5.1-5"; sha256="0gcngfck0dk2rhjg0z1fnc61dqs0s049jy2rkywaf57531s2k8bc"; 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_add = derive2 { name="gamlss.add"; version="5.1-5"; sha256="1fw60f07b7yx7aw00915z49w1d6d7dm4b2sqvcji1682milnxa3n"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
   gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; };
   gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; };
   gamlss_data = derive2 { name="gamlss.data"; version="5.1-4"; sha256="1dgfspbmps6ipzcmw681wjdp320nm50dwsxafgrcwxndqgc7fdqd"; depends=[]; };
@@ -8047,7 +8058,7 @@ 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.2.0"; sha256="1nnsjcs5yghf5nq4hzxzfqi2l5q5wc78zn7rvknanvagliw5zdxh"; depends=[dplyr jsonlite lubridate readr stringr]; };
+  gbfs = derive2 { name="gbfs"; version="1.3.1"; sha256="0kw884fziiczdlvwxrmrxbpikiyglwfa6sf7xqqp4x5vwfrjqmn5"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; };
   gbm = derive2 { name="gbm"; version="2.1.5"; sha256="0vs6ljaqhwwpgr8wlbhmm4v147rd82kl16rpaijqiylxcc8dxyq6"; 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]; };
@@ -8065,7 +8076,7 @@ in with self; {
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
   gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; };
   gdalUtilities = derive2 { name="gdalUtilities"; version="1.0.0"; sha256="1z452lh1n65g78dqynnwq3rcrmm7g4jz7qr25px7qav0zi6944mf"; depends=[raster sf]; };
-  gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.14"; sha256="0dvp1qzxxp6rjqfxpxckbfhdqanksnm4rfgsalvb5wdm5qmm02l9"; depends=[foreach R_utils raster rgdal sp]; };
+  gdalUtils = derive2 { name="gdalUtils"; version="2.0.3"; sha256="00q9lcwm1nr2j31wyk567vy89ifhgh0lxv8h869x4k0r6xlqxp7i"; depends=[foreach R_utils raster rgdal sp]; };
   gdalcubes = derive2 { name="gdalcubes"; version="0.2.3"; sha256="04wxy0w1sh1d64995m0b1ss9ly7n2dz7vdgmxgrdn07w7vhbhacx"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
@@ -8082,7 +8093,7 @@ in with self; {
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
   geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; };
   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=[]; };
+  geepack = derive2 { name="geepack"; version="1.3-1"; sha256="1pyn50pn18ffnraqjb6ncgh3a70c91wq4xyy8n5bva7153556cc2"; depends=[broom magrittr MASS]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
   geex = derive2 { name="geex"; version="1.0.11"; sha256="19qqgr16cd4zsmfgl9ny92ncvf1418ilvhb9h3axw24mkycins61"; depends=[lme4 Matrix numDeriv rootSolve]; };
   geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; };
@@ -8110,7 +8121,7 @@ in with self; {
   geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
   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.1.3"; sha256="0qj6bjhaxq3d5n94qsrhgpy6yh2m9ldk2ch3xffl2bdg3df79jlk"; depends=[Rcpp RcppProgress stringr]; };
+  genepop = derive2 { name="genepop"; version="1.1.4"; sha256="1i7pifh7dyz3vr7138hxcsfixz8y5q5g503gcairvrisf7ggj9fr"; depends=[Rcpp RcppProgress stringr]; };
   generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
@@ -8118,7 +8129,7 @@ in with self; {
   genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; };
   genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; };
-  genio = derive2 { name="genio"; version="1.0.10"; sha256="0l29rz9nap2rglansv8sbldhgngv04v1kdgy0zzxjzwwmsdcjrqp"; depends=[Rcpp readr tibble]; };
+  genio = derive2 { name="genio"; version="1.0.12"; sha256="15v9hdnb1jknbvflvgyyhcx0cqjn3v9zl66mswk59j56qm58bkr9"; depends=[Rcpp readr tibble]; };
   genius = derive2 { name="genius"; version="2.2.0"; sha256="0062g7wyclrbaljwib57s95x5wamc01fr3hgwjjzgv850vbbjqlv"; depends=[dplyr purrr readr reshape2 rvest stringr tibble tidyr tidytext]; };
   geniusr = derive2 { name="geniusr"; version="1.1.0"; sha256="1qnzqlgzq507g9iik00gh242nh3zcg38awrlaxl5zgnsp852kjnv"; depends=[attempt curl httr purrr rvest stringr tibble xml2]; };
   genlasso = derive2 { name="genlasso"; version="1.4"; sha256="01p1cs0h6gwr6f18aaqirgd8yxrhyamakc763y9dm6mndrba2x0g"; depends=[igraph MASS Matrix]; };
@@ -8137,15 +8148,15 @@ in with self; {
   gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; };
   gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; };
   gensvm = derive2 { name="gensvm"; version="0.1.3"; sha256="1r9vd6h3divmjd73p3541mngv452v1dkxc41q7mbkd5qhy34km74"; depends=[]; };
-  genvar = derive2 { name="genvar"; version="0.0.1.4"; sha256="0bnngj0ha9s12gbpjgnc0qybzylmvn9qf30avi0dssibiq1gynfx"; depends=[clubSandwich foreign Formula plm readstata13 sandwich]; };
+  genvar = derive2 { name="genvar"; version="0.0.2.0"; sha256="1agkyq84kl64q77n5sml44ind16c1zf16ivr6c7n08746gra3mbc"; depends=[clubSandwich foreign Formula plm readstata13 rlang sandwich]; };
   geoBayes = derive2 { name="geoBayes"; version="0.6.3"; sha256="153a7kp73wxm5hzzq038p3mnykhakv0c9qa8fpbjijccmbi89970"; depends=[coda optimr 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.1"; sha256="1fb3xm85i36q9l5lspa6fjfa82mv8fnwl30rimrlamss02ff959q"; depends=[MASS RandomFields sp splancs]; };
+  geoR = derive2 { name="geoR"; version="1.7-5.2.2"; sha256="0ynns6961sbylmqyy1lq0l000gab9kq5pz9ciffj0spdw8s91sxc"; 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]; };
-  geobr = derive2 { name="geobr"; version="1.0"; sha256="139wqhw90irx02byqph1klhmjr6f9wackhffr1a148c9c8bhs0i4"; depends=[dplyr httr readr sf]; };
+  geobr = derive2 { name="geobr"; version="1.1"; sha256="1j6g62c4nrjqgvk0yk8b9p52p7a7czwkzly1ld0svvh1hz3yv93x"; depends=[httr readr sf]; };
   geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; };
   geodist = derive2 { name="geodist"; version="0.0.3"; sha256="1qxrbpx265l5vwvicspbqzr2s0k3k6lsrzvxnbhnds95jgq9yw4q"; depends=[]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; };
@@ -8164,16 +8175,16 @@ in with self; {
   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.6-1"; sha256="0q06vj2r8xyiwrkrzixv0ymvwvznk2a6i2sdmykwyzm7vw7phwkw"; depends=[httr jsonlite R6 XML]; };
   geometr = derive2 { name="geometr"; version="0.1.1"; sha256="0bh8m76273vk2hnn2d4fbr9a89av0f8fnww9lfa1v392i56zfi2z"; depends=[checkmate crayon deldir dplyr raster Rcpp rgdal rlang sf sp spatstat tibble]; };
-  geometry = derive2 { name="geometry"; version="0.4.4"; sha256="1mx5n5mw63nij4n6crs9165mlls4fnh1ipw5ch467rjsidgl0mg8"; depends=[linprog lpSolve magic Rcpp RcppProgress]; };
+  geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog lpSolve magic Rcpp RcppProgress]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
-  geomorph = derive2 { name="geomorph"; version="3.1.3"; sha256="12vzf5cjk2zjj4832av93jzq79bnnymrcs9yxw7illy80aavbm6b"; depends=[ape jpeg rgl RRPP]; };
+  geomorph = derive2 { name="geomorph"; version="3.2.0"; sha256="0i9i9xcpiqfsh1gk8xar46q6bqv5vkv8kxshxq26wgpyysnls88a"; depends=[ape jpeg rgl RRPP]; };
   geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; };
-  geonapi = derive2 { name="geonapi"; version="0.3"; sha256="0ylb9cg2s8d06j0flmw434d7hbbqz6yf9di66r7bdp3rgsiypprl"; depends=[geometa httr openssl R6 XML]; };
+  geonapi = derive2 { name="geonapi"; version="0.3-1"; sha256="137g89qbwayd3iw4hfy85a40c8wyyhqd2qsrbqr6j5x155q39wlf"; depends=[geometa httr openssl R6 XML]; };
   geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; };
   geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; };
   geoparser = derive2 { name="geoparser"; version="0.1.2"; sha256="0vca4ijybqgk5dmbk0af4ykvbdkny8dm9d4frh5ikzk28hkvnlik"; 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-10"; sha256="1d9chcvncf8ywrhb43slf86zl2mxzhhsmyifsg9jkbfn8ibbb720"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
+  georob = derive2 { name="georob"; version="0.3-11"; sha256="1rl1wyr9splx58a1y8vgi2gmy9y6ngm4lydwbkp0fk77wiyv9s26"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
   geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; };
   geosapi = derive2 { name="geosapi"; version="0.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; };
   geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
@@ -8188,7 +8199,7 @@ in with self; {
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
   geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; };
   geotopbricks = derive2 { name="geotopbricks"; version="1.5.3"; sha256="06mi13gzilp844bramrly9ar52vs3747m3236g0bwjy3b7gqdq9c"; depends=[raster rgdal stringr zoo]; };
-  geoviz = derive2 { name="geoviz"; version="0.2.1"; sha256="1b4rabf1wsmfa0v4hvs56p8im9lr0aia0nzpi0dyxzbm0jq4z76w"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; };
+  geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; };
   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]; };
@@ -8219,7 +8230,7 @@ in with self; {
   ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
   ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; };
-  ggPMX = derive2 { name="ggPMX"; version="0.9.8"; sha256="1cpywycmn88vvfnpaf2jddx712h3w28k9hiqnkjhg9nfm14jv6ik"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; };
+  ggPMX = derive2 { name="ggPMX"; version="1.0"; sha256="0cv99y4w2p8g0q2w1yv0fc5r2prwcniqlawks86z9avr7963ppmq"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; };
   ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; };
   ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
@@ -8229,15 +8240,16 @@ in with self; {
   ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; };
   ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; };
   ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; };
-  ggalluvial = derive2 { name="ggalluvial"; version="0.10.0"; sha256="05435i5859mi0dyahh9vgfdcqd4wjwznx9ixw1nkaqcdbv843v30"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
+  ggalluvial = derive2 { name="ggalluvial"; version="0.11.1"; sha256="05c59w9rmp59ajw8ybr155c9xfxzlgc76xcnxh3890nh7nn7h0m1"; 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]; };
+  ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; };
   gganimate = derive2 { name="gganimate"; version="1.0.4"; sha256="0z25fanxakc4vh67dnx99iygkxkpv8rjh9vlyypbwgy6rrg2mvpc"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; };
   ggasym = derive2 { name="ggasym"; version="0.1.2"; sha256="1nhsiamiv8dwn5cb2l7z7dzy46x6qcygxr2ncp0nqp6rnl7mh712"; depends=[broom corrr dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; };
   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.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; };
-  ggdag = derive2 { name="ggdag"; version="0.2.0"; sha256="0jds4yqnf2pjbq0b2a81mx1akjzcvc21v2lh8z91h9frxw47g63g"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr pillar plyr purrr stringr tibble tidygraph]; };
+  ggdag = derive2 { name="ggdag"; version="0.2.1"; sha256="0cqshv72fd188z58k0df67i52x4ss764x28x7xn2m9f7cypnqw38"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr pillar plyr purrr stringr tibble tidygraph]; };
   ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; };
   ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
@@ -8245,7 +8257,7 @@ in with self; {
   ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; };
   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.13.0"; sha256="0ryfbaav0k874kbwmhbiv7fan93dmkpaimm1iw5kryjhhs3917lb"; depends=[dplyr insight magrittr MASS purrr rlang sjlabelled sjmisc]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.14.0"; sha256="1djz82xww86h8f33m2vm40lliicppgyhm6hyn3h6rzrqjrlrsmdw"; depends=[insight magrittr MASS purrr sjlabelled sjmisc]; };
   ggenealogy = derive2 { name="ggenealogy"; version="1.0.0"; sha256="1wi29f7allky84w9w2512v8gs687gvypsbd7r4vyxs24l6pfssyc"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
   ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; };
@@ -8261,7 +8273,7 @@ in with self; {
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
   gghalves = derive2 { name="gghalves"; version="0.0.1"; sha256="03s1wrfgkd55zmf3scv6kp32s3lcpbm5prnc5ndgad43zq8jyi09"; depends=[ggplot2 gtable]; };
   gghighlight = derive2 { name="gghighlight"; version="0.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; };
-  ggimage = derive2 { name="ggimage"; version="0.2.5"; sha256="158hbqlka4nqyflq0daqp829xjs0rckzj3fmwd980g23g2xk2m92"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
+  ggimage = derive2 { name="ggimage"; version="0.2.7"; sha256="01yymg5q4bjnchlxpc7yjskjaz1bkf707fvr01kn18cr4bb606mg"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; };
   gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; };
   gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; };
   ggiraph = derive2 { name="ggiraph"; version="0.7.0"; sha256="1002mf2dp7ram5yrj9qlg9rawz083k130k6bjvdidq0x800ps7b4"; depends=[gdtools ggplot2 htmltools htmlwidgets purrr Rcpp rlang uuid xml2]; };
@@ -8276,7 +8288,7 @@ in with self; {
   ggmcmc = derive2 { name="ggmcmc"; version="1.3"; sha256="0p3akjbi0044nma8ynvqa42bkrgrb0jjx323k2pbrnlkq8x3ma1b"; depends=[dplyr GGally ggplot2 tidyr]; };
   ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; };
   ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; };
-  ggmsa = derive2 { name="ggmsa"; version="0.0.1"; sha256="1f16fvcnk0923dhzlxnq0gmq4y4qnkdzy0h0ijinqm2iy3sfy5gp"; depends=[ggplot2 ggseqlogo magrittr tidyr treeio]; };
+  ggmsa = derive2 { name="ggmsa"; version="0.0.2"; sha256="1ryzifcm1qsqng5gljdhgx6p81i8wg9s86j9bnlcllp0d6mbca2x"; depends=[Biostrings ggplot2 ggseqlogo magrittr tidyr treeio]; };
   ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; };
   ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; };
   ggnewscale = derive2 { name="ggnewscale"; version="0.4.0"; sha256="0w9lykxdrifm69mr157x1hirz37ws9m5lpmxaqbfq5picqyvplsx"; depends=[ggplot2 stringi]; };
@@ -8305,7 +8317,7 @@ in with self; {
   ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; 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.1"; sha256="10vjrcmx8yknfbx93d9a4y3z8gafri0fhimw6hcq733dmdvkml6m"; depends=[ggplot2 Rcpp scales]; };
-  ggridges = derive2 { name="ggridges"; version="0.5.1"; sha256="0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01"; depends=[ggplot2 plyr scales withr]; };
+  ggridges = derive2 { name="ggridges"; version="0.5.2"; sha256="03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh"; depends=[ggplot2 plyr scales withr]; };
   ggroups = derive2 { name="ggroups"; version="1.2.1"; sha256="159bzdck1npcp3spfi3ash1y5zhga9y0fbgw5vzrkayqrw4ayx4n"; depends=[]; };
   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]; };
@@ -8314,11 +8326,11 @@ in with self; {
   ggsn = derive2 { name="ggsn"; version="0.5.0"; sha256="04vnap83w06hbqqi5kgxmrdb3a13n5mcdk5lllymv6nrzvl84f2x"; depends=[ggmap ggplot2 maptools png sf]; };
   ggsoccer = derive2 { name="ggsoccer"; version="0.1.4"; sha256="126czg8xyms959pc398d63fwrs6p9f253xnrgig5sw4vfxl9hqgm"; depends=[ggplot2]; };
   ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; };
-  ggsom = derive2 { name="ggsom"; version="0.2.1"; sha256="0gycd3yzdy58m22r62my5v0s00mr7ga7mcfa6i300arp47lzdwq1"; depends=[dplyr ggplot2 ggthemes kohonen tidyr tidyverse]; };
+  ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; };
   ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.3.4"; sha256="18p0wfcnkgahs43j2msrm6x5h91bpi3pnwlqlckniyfixhfdlycy"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.3.5"; sha256="0pvkh4cr9nyhhv9ikjs7nhjagal63k8zfbik28cmw2c2x31m019v"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3.3"; sha256="0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh"; depends=[ggplot2 plyr rlang withr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.1.3"; sha256="1sia2sp929li67rfjbcgqwngxcv066939xnaz9mvk8bfxsz6qp03"; depends=[broomExtra cowplot crayon dplyr forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight metaBMA metafor pairwiseComparisons paletteer parameters psych purrr rlang scales statsExpressions tibble tidyr WRS2]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.1.4"; sha256="09dzph9h4zj6msz9d5dn7g8rbvl5781gagsad5hfjqn8m7vc1a47"; depends=[broomExtra cowplot crayon dplyr forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight metaBMA metafor pairwiseComparisons paletteer parameters psych purrr rlang scales statsExpressions tibble tidyr WRS2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; };
@@ -8339,7 +8351,7 @@ in with self; {
   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.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; 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]; };
+  gistr = derive2 { name="gistr"; version="0.5.0"; sha256="07k9p5sfy0k45frx63dwp6pk3gyh5zdv79f4knsciakk6xq9ds59"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.26.1"; sha256="0dbl845sahv2i641ncaf06w06djravwc5wknp9syzx0ad8l0kmhk"; depends=[]; };
   git2rdata = derive2 { name="git2rdata"; version="0.2.0"; sha256="1hzvr1h6rbqqf69xkjc1c2x3c5wqp8za40yim7vd7sb398f1iq4q"; depends=[assertthat git2r yaml]; };
   gitgadget = derive2 { name="gitgadget"; version="0.5.2"; sha256="0la0x3p50wk5wv2p4vkf3rh72psz3k18lcymxn354nqb7m1xdggs"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
@@ -8347,7 +8359,6 @@ in with self; {
   gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; };
   gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; };
-  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.7"; sha256="008g394sqcxr3jdhivldaaqi3d6h2mn16wdxcsqmspk80kiljnvr"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
@@ -8361,11 +8372,11 @@ in with self; {
   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.4"; sha256="1al4i8r9g7izl5d4c3ccqx6zw9vfcvdr6zgzql8wjkq9fsdrrnq1"; depends=[Rcpp RcppArmadillo]; };
-  gld = derive2 { name="gld"; version="2.6"; sha256="04apyfv5xxwwpfv3a7wmc5f0xgpp3im97zmwl8ppiwrzrcnk9lgr"; depends=[e1071 lmom]; };
+  gld = derive2 { name="gld"; version="2.6.2"; sha256="1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; };
-  gllvm = derive2 { name="gllvm"; version="1.1.7"; sha256="1m5qm66ca96lfp6b3c0zls2l0yvifvmys729gbaahjp16jq320yc"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
+  gllvm = derive2 { name="gllvm"; version="1.2.0"; sha256="1ks2kz3c7gfcnxc0c8s0d88ygnzkczczv4z8why8qqp7s5bivk10"; depends=[fishMod MASS Matrix mgcv 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.1-0"; sha256="16ahl6jvydmx48hzixv8whsr55w527k0a1xbic20crinblx0ncb4"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; };
@@ -8373,7 +8384,7 @@ in with self; {
   glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; };
   glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; };
-  glmdisc = derive2 { name="glmdisc"; version="0.2"; sha256="0f5bn307xvq1n9zvw6y8324v6i89vh2bam8z6s0q581xyzpbvmlg"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; };
+  glmdisc = derive2 { name="glmdisc"; version="0.3"; sha256="13x5ri4kig0h49j3fqpj5ad37jnm0phnxr42h64562fcj7bmiidq"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; };
   glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmertree = derive2 { name="glmertree"; version="0.2-0"; sha256="0lfn6dap38i6cnfy4gdap13aq81h9cm3bip7ci57q9br9b00x7ib"; depends=[Formula lme4 partykit]; };
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
@@ -8383,14 +8394,14 @@ in with self; {
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; };
   glmmTMB = derive2 { name="glmmTMB"; version="0.2.3"; sha256="035hkywa37bz555fv6znxd4hfcs5w884365wfnwk4jx5vann4vvb"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
-  glmmboot = derive2 { name="glmmboot"; version="0.4.0"; sha256="1n25175nxmgirs41nhavrjgfqnl74hn63nxi6rdjbk40ngj0aq78"; depends=[]; };
+  glmmboot = derive2 { name="glmmboot"; version="0.5.0"; sha256="0d1nym28svij00wjp2lx42fczllxmjl95hy45dgy6j3k70pvvgfi"; depends=[]; };
   glmmfields = derive2 { name="glmmfields"; version="0.1.3"; sha256="1sygppwm58hvwj95nlyz59cjlnkrq82kpws6izbivl7p6wb06lil"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders]; };
   glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
-  glmnet = derive2 { name="glmnet"; version="3.0-1"; sha256="04wa926mnss53p1fhx0mjgxnmwmmqls12sc0sy7w09kbmyqa3fq7"; depends=[foreach Matrix shape]; };
-  glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.3"; sha256="1n89810vs8fx0vack2gzsy04dqnvg6klnms5zljb7ajg4rsq1vrl"; depends=[glmnet Matrix]; };
-  glmnetcr = derive2 { name="glmnetcr"; version="1.0.4"; sha256="1fizw48lwhdyzfdmhl1hhcv7pfjf2zm8b96m2hcwm1ckvshf5j76"; depends=[glmnet]; };
+  glmnet = derive2 { name="glmnet"; version="3.0-2"; sha256="0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl"; depends=[foreach Matrix shape]; };
+  glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.4"; sha256="1bf5gn3wrlm3mzgrf9dyv07yv90aly5zqgzf597ws6600ln1j9nd"; depends=[glmnet Matrix]; };
+  glmnetcr = derive2 { name="glmnetcr"; version="1.0.5"; sha256="0s21kaky23wgm0nbgncrg6xiwnp5x5s2zcv854493rrclx2s6r5w"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; };
-  glmpathcr = derive2 { name="glmpathcr"; version="1.0.7"; sha256="18i0ivvxyirgbp5qjc2av1wanang9pbjimwva448ighad7m2dsqr"; depends=[glmpath]; };
+  glmpathcr = derive2 { name="glmpathcr"; version="1.0.8"; sha256="00hbgp1kdbvihqvx03vv6gq32whrkcfq3n32bbj3cda85dnivlwq"; depends=[glmpath]; };
   glmpca = derive2 { name="glmpca"; version="0.1.0"; sha256="19fiivv72nnz4cax5nibcpzm47vma54h3myxcb9bhz3rm04b5srv"; depends=[]; };
   glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; };
   glmtree = derive2 { name="glmtree"; version="0.1"; sha256="03baxmabfpyl89a5dqk16fhvcgw58daji3fkqc35yy6hzsiwg04q"; depends=[caret dplyr magrittr partykit]; };
@@ -8400,14 +8411,14 @@ 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.4"; sha256="0szyv1ayyk31bh3xqlkj43020w44xq6s4rw2bxwizyjssxm3b1br"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.12.5"; sha256="1ha8iasgijp4q3v2b0b17y1wh7cd3nvzd9b03w49qm2bidkaf68m"; 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.1"; sha256="06p8zvmshymcw994mmf1ar00kfj645z8dp18yy4i5bl6qydbpb8k"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
   glue = derive2 { name="glue"; version="1.3.1"; sha256="1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag"; depends=[]; };
-  gluedown = derive2 { name="gluedown"; version="1.0.0"; sha256="1a2jzi5508bd9zp83jh5w164iqw58xnzk16icd845l061qbnjvcw"; depends=[glue knitr markdown stringr]; };
-  gluvarpro = derive2 { name="gluvarpro"; version="1.0"; sha256="0knqn4cz14j5hq2w2s71aj8girf68a7v10w5jy0r04zvl4xlr3y7"; depends=[ggplot2 pracma scales tidyr zoo]; };
+  gluedown = derive2 { name="gluedown"; version="1.0.2"; sha256="1vq5zgwlwj5rzdwj7z9ypnvj2fw9m653bdbivb2hx2z2hl8qwfp9"; depends=[glue]; };
+  gluvarpro = derive2 { name="gluvarpro"; version="2.0"; sha256="0ka9ymajkm910r8nzvcx19zvpmz8vr59k1a5vhbz49sqqc0ri68g"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; };
   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="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; };
@@ -8416,12 +8427,12 @@ in with self; {
   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]; };
+  gmm = derive2 { name="gmm"; version="1.6-4"; sha256="15dwf3dgr88n3s1i4lqmv75vfmrc85kdhhgs2gprqkhpgprmzb83"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-3.1"; sha256="01mman2nh7wzlhh89iwaskz9n15v3p5llid5557dwmqn8ybzsdvx"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.5"; sha256="042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
-  gmvarkit = derive2 { name="gmvarkit"; version="1.1.1"; sha256="193ka13ka3vczc0kaxxwp1j55yczclarsjdc7nqj3hbk6b7124ma"; depends=[Brobdingnag mvnfast pbapply]; };
+  gmvarkit = derive2 { name="gmvarkit"; version="1.1.2"; sha256="02m6brh7rj35a0yjzmfc1p16rlyb97fsqbsqjj0ndcdadbqcxz73"; depends=[Brobdingnag mvnfast pbapply]; };
   gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; };
   gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; };
   gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; };
@@ -8430,10 +8441,9 @@ in with self; {
   gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; };
   gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
   goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; };
-  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]; };
-  goffda = derive2 { name="goffda"; version="0.0.5"; sha256="1766fzk32072pq2m12bq0kyh1n6a7ij2j2j76jmqp8l3zkj722ha"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; };
+  goffda = derive2 { name="goffda"; version="0.0.6"; sha256="0j2fx3vzd4rda4hlhgkkcq1rgn79rah2r5dkx2rikl3rkfjjj6yi"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; };
   goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; };
   goftest = derive2 { name="goftest"; version="1.2-2"; sha256="0ivnkqhv5xgiv05dm648nngacymd8x8g0fyppv3bc0mhcqk9k5z4"; depends=[]; };
   gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
@@ -8459,8 +8469,9 @@ in with self; {
   googlesheets4 = derive2 { name="googlesheets4"; version="0.1.0"; sha256="1n12s92cbn6cnnkm629brdkghvj0r8x7rz191c0lbdfd8mgbw1pw"; depends=[cellranger curl gargle glue googledrive httr magrittr purrr rematch2 rlang tibble]; };
   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]; };
+  gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
-  govdown = derive2 { name="govdown"; version="0.7.0"; sha256="0vp43bhb23cnasdizk5h6qzczk0zr1hxn7s8k5m8iskvcpfx0gn0"; depends=[rmarkdown]; };
+  govdown = derive2 { name="govdown"; version="0.8.0"; sha256="0sfjpbpzpay9jw5fys8dkkfilw9r8yfj2xhb20pvjk3l6hrsjwvk"; depends=[rmarkdown]; };
   gower = derive2 { name="gower"; version="0.2.1"; sha256="007ivwn1nagpi26qq8iih1c2l61c53glvv60n90hi341ry8vwgxg"; depends=[]; };
   gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
@@ -8468,11 +8479,10 @@ in with self; {
   gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
   gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; };
-  gplots = derive2 { name="gplots"; version="3.0.1.1"; sha256="033plcfs9w8pmn84n24mdhiixdirc2a7pz6dvm61fpd20gwh7cbx"; depends=[caTools gdata gtools KernSmooth]; };
+  gplots = derive2 { name="gplots"; version="3.0.1.2"; sha256="0vrm7wqrmqsmfrc070r9chpzb0vv60pay2lyar9qxfry6bsrvx86"; depends=[caTools gdata gtools KernSmooth]; };
   gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
   gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; };
-  gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
-  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.7"; sha256="19qfmk2w7bzycw8nw7np2f8j1wd5dr6bpbivxzzmnnp5zc1nmkiv"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; };
+  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.8"; sha256="0xa2r40alsj9d1kgkchli7p9wcffbjqbz16f8crribgl47zwlvxc"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; };
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
   gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; };
@@ -8483,14 +8493,14 @@ in with self; {
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
   gradeR = derive2 { name="gradeR"; version="1.0.5"; sha256="1c7x16z1mn7ys63vdwpy8b2x21k35pbmnpl52h372pfrsvxxhb23"; depends=[testthat]; };
   gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; };
-  grainscape = derive2 { name="grainscape"; version="0.4.0"; sha256="1i5bc1a0rh2grvd4xls2iz428jxspjrk038hm37cn2n0h88yx1xl"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; };
+  grainscape = derive2 { name="grainscape"; version="0.4.2"; sha256="0njwhjg1xz6cbibcdc00qpvii97rri0bm12g1cqf5yvrnax1wyh5"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; };
   grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; };
   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]; };
-  graph4lg = derive2 { name="graph4lg"; version="0.1.1"; sha256="095nr0a00p8nl6plmkl68czj6r74bwwvmk7xzdpw4i32j4raldpi"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp stringr tidyr vegan]; };
-  graphTweets = derive2 { name="graphTweets"; version="0.5.2"; sha256="1rizfabd3j3n5ddzg6c2a4jy4jnbdpy2zv8k09jqrxjkg1cvl5m0"; depends=[combinat dplyr igraph magrittr purrr rlang rtweet tidyr zeallot]; };
+  graph4lg = derive2 { name="graph4lg"; version="0.2.0"; sha256="1y0kc7jm878ck287h3088nmfwfky1m7j88085zb5fd04273cy8hl"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp spatstat stringr tidyr vegan]; };
+  graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang 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.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; };
   graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; };
@@ -8501,22 +8511,21 @@ in with self; {
   graphon = derive2 { name="graphon"; version="0.3.3"; sha256="1jsjbyk1hbmdlgap3gaf1cdrrbgfccr4lgpdi7g3bzp3mjjbijh5"; depends=[Rdpack ROptSpace]; };
   graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
-  gratia = derive2 { name="gratia"; version="0.2-8"; sha256="1diijk4s0x29aq7l8bjx5canjykj9xlsr7rajvj0jjxx7i9jaw56"; depends=[cowplot dplyr ggplot2 mgcv mvtnorm tibble tidyr]; };
+  gratia = derive2 { name="gratia"; version="0.3.0"; sha256="0n0ps6r65bh8yl6rq6jdh9lxcm66py3rphcz6649v3qz24ijq110"; depends=[cowplot dplyr ggplot2 mgcv mvnfast purrr rlang tibble tidyr]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
   grattan = derive2 { name="grattan"; version="1.8.0.0"; sha256="1604hrbh897hdgxg2ack4c47xzqlgwgy4nn96lyc2sk3qvw0l7s7"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp rsdmx zoo]; };
   gravitas = derive2 { name="gravitas"; version="0.1.0"; sha256="0w53rz6ips5cl2xigb16ffskjdnlx98f20slkpvdh4s2vwvbvk74"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; };
   gravity = derive2 { name="gravity"; version="0.9.8"; sha256="1yx71gidv3ivjfip994ciaiwk2cvvm8z16yax4lwpwgl1fxj1p4k"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; };
-  grec = derive2 { name="grec"; version="1.3.0"; sha256="0fksxzjnm843wbcwjf06gcbbw4lfz7zk361bj6qdpnkcfcl22c1w"; depends=[imagine raster]; };
-  greenclust = derive2 { name="greenclust"; version="1.0.0"; sha256="1qqlg40bzi088vn4yx33izf12jsviyqj63a24xw2426lg4lif3kv"; depends=[]; };
+  greenclust = derive2 { name="greenclust"; version="1.1.0"; sha256="198ix55x8cl5wx09p6ahzy3bvig86mvqf2qywjfilp6b4hnjgk7l"; depends=[]; };
   gremlin = derive2 { name="gremlin"; version="0.1.0.1"; sha256="1qsjj910lmwdnmbn0fxakw713sk7myavgrmp5xm86my7cm866hmb"; depends=[Matrix]; };
   gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
   greta = derive2 { name="greta"; version="0.3.1"; sha256="0wy1619drj8ir6r44xcliiirgibksd80gmjx21am2h580k0x0xq2"; depends=[coda future progress R6 reticulate tensorflow]; };
   gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; };
   grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.5.6"; sha256="1m52sr7alil9s9aai22wk5x1qdm3lach5i8wpf9z2dy72jh2hw6i"; depends=[forecast lamW nloptr numDeriv Rcpp]; };
+  greybox = derive2 { name="greybox"; version="0.5.7"; sha256="1igx5lv0li3j5kaz70255fbh8w3icnvvqcqifr381q1jbhv3zal1"; depends=[forecast lamW nloptr numDeriv Rcpp statmod]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
-  grf = derive2 { name="grf"; version="1.0.0"; sha256="0igiiwf8myifivp933q6glpadlbldqpfwi29s58mcd5dhiyyn4yh"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
+  grf = derive2 { name="grf"; version="1.0.1"; sha256="0m2r60w5w1c2h3rnia0zxbdvn2mrixq7p4qcw54lv491lyyxl0my"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridBezier = derive2 { name="gridBezier"; version="1.1-1"; sha256="1n5d6svxblcxpzf79px0qjxsydpwjpnfcagnwk35ljinyd0wv68z"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
@@ -8536,16 +8545,16 @@ in with self; {
   groupdata2 = derive2 { name="groupdata2"; version="1.1.2"; sha256="0v206sq4h50v1scb2i8qwwi3kxiqamxwrnn1gblwk9i3xkmqs48y"; depends=[dplyr numbers plyr rlang tibble]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
   groupedSurv = derive2 { name="groupedSurv"; version="1.0.4"; sha256="106z47icn680nyzj9gkq7g8gv73ajgmx0ypiv4l1j01cd3nripj2"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; };
-  groupedstats = derive2 { name="groupedstats"; version="0.1.0"; sha256="1a517qxwbzxwilwqblvp0i8bwap1cgzvnmys4ab10c77npy9jl3z"; depends=[broomExtra dplyr glue lme4 parameters purrr rlang robust rstudioapi sjlabelled sjstats skimr tibble tidyr]; };
+  groupedstats = derive2 { name="groupedstats"; version="0.1.1"; sha256="0fp073mf2qghi4l1jfr41r1b7n0h3zaa96q7wk7xwi3a3d7vs152"; depends=[broomExtra dplyr glue haven lme4 parameters purrr rlang 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]; };
   growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
   growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; };
-  growthPheno = derive2 { name="growthPheno"; version="1.0-15"; sha256="1wxjff9ylaxksn9w5wjhwka7bgc5z2qv29n10162wryr2ak6lps9"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
+  growthPheno = derive2 { name="growthPheno"; version="1.0-21"; sha256="1lhzf1i1k786c6j0vn3ay6mnmk3bh7xhymq2ywwjz228hszn1bf2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; };
   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]; };
+  growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; };
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
   grplasso = derive2 { name="grplasso"; version="0.4-6"; sha256="0xr6plgnc3lp93rd4jk4dqjix8kgl8s2b68fh41k6jwd5y8d7pks"; depends=[]; };
   grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; };
@@ -8558,7 +8567,7 @@ in with self; {
   gsEasy = derive2 { name="gsEasy"; version="1.3"; sha256="00471kfjb6zw3n4nbx3a91xjn748hw3xpl9pq5sgbrf6xg9gcf7c"; depends=[ontologyIndex Rcpp]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
   gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
-  gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; };
+  gsbDesign = derive2 { name="gsbDesign"; version="1.0-1"; sha256="0wb62y4fcca1qq27kgk59qxm1nx5njcs94cr8x1bsnk88z945p9p"; depends=[gsDesign lattice]; };
   gscaLCA = derive2 { name="gscaLCA"; version="0.0.2"; sha256="0s6rnyd632xq04pnyq1j3571qv7j5bzxir2nhk5jk9i8myf9fc9k"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS progress psych stringr]; };
   gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; };
   gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
@@ -8571,7 +8580,7 @@ in with self; {
   gsrsb = derive2 { name="gsrsb"; version="1.1.1"; sha256="0yjxzc69ihsx5ni6jb4shsvl9vskqlls3gmpckmzx5nsh1l5s5vb"; depends=[ldbounds mvtnorm xtable]; };
   gss = derive2 { name="gss"; version="2.1-10"; sha256="1qhywsn9244fc7ir705xc8s832ygd7w0j72k3d58bdx9wv57xi16"; depends=[]; };
   gstar = derive2 { name="gstar"; version="0.1.0"; sha256="1582f7jcphb32j3wdc345qa5sgm2xyimlc6r5r5jay7ca5ll8c98"; depends=[dplyr ggplot2 reshape2 xts zoo]; };
-  gstat = derive2 { name="gstat"; version="2.0-3"; sha256="1qfcg8zb3hlpcb6x6z2hdn08g0d9z7fkn9yyi1c1l8l9pzk3za90"; depends=[FNN lattice sp spacetime zoo]; };
+  gstat = derive2 { name="gstat"; version="2.0-4"; sha256="0sksk3a08bx70h8230ca7sz8jhwp37f4d34igh192668vz0cvljp"; 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.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; };
@@ -8585,31 +8594,29 @@ in with self; {
   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.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; };
-  gtsummary = derive2 { name="gtsummary"; version="1.2.3"; sha256="0mpr94l2hx3zvcgk1scbjl2080500lmhb6zdf83i0j41dqhd2k3k"; depends=[broom broom_mixed crayon dplyr glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; };
+  gtsummary = derive2 { name="gtsummary"; version="1.2.4"; sha256="0sn05c68p74zk90j3zxj9jqa1aim28ydqlw3gfn8j4h72pnklyv0"; depends=[broom broom_mixed crayon dplyr glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
   gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; };
   gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
-  gustave = derive2 { name="gustave"; version="0.4.0"; sha256="1swnkb1134mnlnfpdchyhmrhr0r5nw90yczsg52hwbhj8hjl2axp"; depends=[Matrix]; };
+  gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; };
   gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; 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]; };
   gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
   gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; };
   gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; };
-  gwer = derive2 { name="gwer"; version="1.0"; sha256="1pwdama457cjr764wlfqcsap5wjn6i613aqrhzpcd0ivi5r2b0vm"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; };
+  gwer = derive2 { name="gwer"; version="2.0"; sha256="05wz3ayhplmjwbdb6mg8m5mj6gw0n8rh55lw208wbdm6c8jmjywc"; depends=[assertthat glogis maptools Matrix sp spData spdep spgwr]; };
   gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
   gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; };
   gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; };
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
-  gwsem = derive2 { name="gwsem"; version="0.1.5"; sha256="0pzizjhxfxq73xq0kh5sj8v637iz4wqfv5cm9jxd2laid7fqgnb1"; depends=[BH data_table OpenMx]; };
   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.26.0.2"; sha256="1ldjk1gm6jb5zvk2rmlfah4zm827dpmj4c5q83ysd4arwqqz5gna"; 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="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; };
   hIRT = derive2 { name="hIRT"; version="0.2.0"; sha256="1vgmr36dbcn2ah9pzhc46zh1va7y7w3zr4mpmyf626m1bq0alb39"; depends=[pryr rms]; };
   hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
@@ -8617,6 +8624,7 @@ in with self; {
   hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hablar = derive2 { name="hablar"; version="0.2.0"; sha256="0242gqcjh04kgv1zf9idm4v2vrxm1vm8nvwhcl3mf08w9a8la2aw"; depends=[dplyr]; };
+  hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; };
   hagis = derive2 { name="hagis"; version="3.0.1"; sha256="1bljpva3j7x87hdmy8s9sh37r5vd8wkjzjqbk57akl654x6b0gfv"; depends=[data_table ggplot2 pander]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
   halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; };
@@ -8634,6 +8642,7 @@ in with self; {
   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]; };
+  hardhat = derive2 { name="hardhat"; version="0.1.1"; sha256="06l4zcqz76c2m9lxa5d6wqcbq1xkkxk0wynka09y5fyh9q82c0g6"; depends=[glue rlang tibble vctrs]; };
   harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; 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="2.1.0"; sha256="151kpg47b1hyv6rc3cksykqw8pz0xqm0q9xf9sxa2w14ibymvc8k"; depends=[ggplot2 gridExtra]; };
@@ -8664,7 +8673,7 @@ in with self; {
   hdd = derive2 { name="hdd"; version="0.1.0"; sha256="0hnqjfp78s8fiabibf0dl57sj170ri1ysf7pyrk45z4qsnizbyn2"; depends=[data_table fst readr]; };
   hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; };
   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.3.0"; sha256="1pq12vkfqxvcaznwaxvjdg3acimk5a20m8h18sixvxc34vnqxw8f"; depends=[bit64 R6]; };
+  hdf5r = derive2 { name="hdf5r"; version="1.3.1"; sha256="0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx"; depends=[bit64 R6]; };
   hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; };
   hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
@@ -8680,7 +8689,7 @@ in with self; {
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
-  heatmaply = derive2 { name="heatmaply"; version="0.16.0"; sha256="1qhxk48qh61qjxdlhl0qffdh3yh8iiwccid5ssngdv433q0cmyc1"; depends=[assertthat colorspace dendextend ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
+  heatmaply = derive2 { name="heatmaply"; version="1.0.0"; sha256="0576gml3bcl7r1biigzj1rag2xzz422knbw7arc8d2gsakjj757g"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
   heatwaveR = derive2 { name="heatwaveR"; version="0.4.2"; sha256="1fp38vlb4646jg397gsxmf5ws15grmmg6hdzijwll5zsg6a9xhg4"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; };
   hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; };
@@ -8693,9 +8702,8 @@ in with self; {
   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]; };
-  hereR = derive2 { name="hereR"; version="0.2.0"; sha256="0ki819gds0mndq56bxdyv91qkbm9i7iqsb63ipmy4w9sd1smx1ml"; depends=[curl data_table jsonlite lwgeom sf stringr]; };
-  hergm = derive2 { name="hergm"; version="4.1-5"; sha256="0i75jcr63gbivwz680d5wrbz01nwlklfg5h8zqvk2r16vbpwl8ag"; depends=[ergm igraph intergraph latentnet Matrix mcgibbsit mlergm network Rcpp sna stringr]; };
-  heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
+  hereR = derive2 { name="hereR"; version="0.3.0"; sha256="119py0lpbnc03v2md3wg5pbq7kz40rw82jhmc529i6hkz4qf65js"; depends=[curl data_table jsonlite lwgeom sf stringr]; };
+  heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
   hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; };
   hesim = derive2 { name="hesim"; version="0.2.2"; sha256="1wchccw9761iz0sk5sd8ahdzpphrd4k9rmgg8f9cgp43aza68ic2"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; };
@@ -8710,7 +8718,6 @@ in with self; {
   hexbin = derive2 { name="hexbin"; version="1.28.0"; sha256="0b58jb1kz39wzrnkv077cfzns889xly7psvhxnm3xmnx6yvd986d"; depends=[lattice]; };
   hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; };
   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.2-1"; sha256="1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc"; depends=[hglm_data MASS Matrix]; };
   hglm_data = derive2 { name="hglm.data"; version="1.0-1"; sha256="0mw1s0kahsh9jmwkxysfy5f7vbld7mpzmdnnww6im5h21jhnczx2"; depends=[MASS Matrix sp]; };
@@ -8723,7 +8730,7 @@ in with self; {
   hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; };
   hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
   hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; };
-  hierNet = derive2 { name="hierNet"; version="1.7"; sha256="1yjsbi17qkz7x9q9x6i8312skwf4gjyisp2096wbg9s19dzvccvi"; depends=[]; };
+  hierNet = derive2 { name="hierNet"; version="1.8"; sha256="06ag2vnpdjpmw9q0gzghkxsqx6mh743j8wpsbah4ff742h23hy0w"; depends=[]; };
   hierarchicalDS = derive2 { name="hierarchicalDS"; version="3.0"; sha256="16d6l3y21nhynfjk4swp3pnjr6vhcxq369djgxz907zsjby35gkz"; depends=[coda ggplot2 Matrix mc2d MCMCpack mvtnorm rgeos truncnorm xtable]; };
   hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; };
   hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; };
@@ -8733,14 +8740,15 @@ in with self; {
   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.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.6.1"; sha256="0531kvsd06h684kksci63vyl865hiiic624fqdqicf0sis2bd1sd"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; };
-  highlight = derive2 { name="highlight"; version="0.4.7.3"; sha256="0zzq9c1rb6j7rgb4943k64khgz554jrc5caqzji0ia7x9wbksd92"; depends=[]; };
+  highfrequency = derive2 { name="highfrequency"; version="0.6.3"; sha256="0fhkarhqgrigbfakf5lmandc5wmdb4q9dq974wygifa3j6khqxz4"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; };
+  highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; };
   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.8"; sha256="0my6idnhmmgs4q1vs40y2lh56yij2p59mpwvm53wjs2zk6x1zl2b"; depends=[]; };
   highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; };
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hilbertSimilarity = derive2 { name="hilbertSimilarity"; version="0.4.3"; sha256="1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp"; depends=[entropy Rcpp]; };
+  hildareadR = derive2 { name="hildareadR"; version="0.1.0"; sha256="0xvwpp9cb2bvy91081v0pvk778bbcginlnlq3dfv2cg7xnrhy0cn"; depends=[dplyr haven]; };
   hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; };
   hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
@@ -8748,30 +8756,30 @@ in with self; {
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
   hipread = derive2 { name="hipread"; version="0.2.1"; sha256="0zll3w0arwjaz16dr9dxns3s25p3fiq4ccnziq4nw7i552zaixd7"; depends=[BH R6 Rcpp rlang tibble]; };
-  hisse = derive2 { name="hisse"; version="1.9.5"; sha256="05063gprbn7i2hpg8hx2ryfrd3rpmb66c2h5i60830v7s7x4fyb9"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
+  hisse = derive2 { name="hisse"; version="1.9.6"; sha256="1yli61d0qbmg0prkvlbq6l6rqj859bgg46rsixa3ffq2dsk4w7s7"; 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-25"; sha256="0yymc7fw4qkbigr8jiw2nzjyrw0ikkipz62pdn3bpz1f7nb7mi93"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
   histry = derive2 { name="histry"; version="0.2.4"; sha256="01rdpzkfq7nyiq1gh0cm89dn3466cmhgfj9x19lhl2yvh8xsdz8x"; depends=[CodeDepends evaluate fastdigest roprov]; };
   hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; };
   hitandrun = derive2 { name="hitandrun"; version="0.5-5"; sha256="18zbyv7y7sv7g075swwbx6gmxf468vyl41d2cvq3am5c1rwhw1d4"; depends=[rcdd]; };
-  hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
+  hive = derive2 { name="hive"; version="0.2-2"; sha256="0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n"; depends=[rJava XML]; };
   hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; };
   hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; };
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; };
+  hmgm = derive2 { name="hmgm"; version="1.0.2"; sha256="1sln43c8f40kxa9gx0iykgv434km7gsldn748ilsdcxg566ayvzj"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; };
   hmi = derive2 { name="hmi"; version="0.9.17"; sha256="08cppa061xn13lyp7d9jsybn0cc6k2ffml79m5bp7fk11gzq18mb"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; };
   hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; };
-  hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-11"; sha256="0s0qzwg5lidmzcxgdbjnq6dqal8xm28h75drrjm712pg36577fcg"; depends=[nnet]; };
+  hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-12"; sha256="1jxbwqh0cc0f07qza0kjbhh3zy7xlk5q7gb8078kprg37if1qd2p"; depends=[nnet]; };
   hmmhdd = derive2 { name="hmmhdd"; version="1.0"; sha256="16jz951d1ssai0gmfnnfikkkvc8yca29a82dq7092kbzwc4i90sk"; depends=[gmfd mvtnorm roahd]; };
   hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
-  hms = derive2 { name="hms"; version="0.5.2"; sha256="0h24dsagn4kcr65arn73mpqapcg002kw4kyxfqyff95j6s6cjifl"; depends=[pkgconfig rlang vctrs]; };
+  hms = derive2 { name="hms"; version="0.5.3"; sha256="1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf"; depends=[pkgconfig rlang vctrs]; };
   hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; };
   hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4.1"; sha256="152vz6cddphmxvm7vi6f3b7jjpib0nsb6qv2k1wrmfrpvv3hgsxx"; depends=[statmod survival]; };
   hoardeR = derive2 { name="hoardeR"; version="0.9.4-2"; sha256="1jdxfalmi4p7gwb7jndxbzbklv1fk0c57shnl4jz27s81lndg437"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools_fileHandler httr IRanges KernSmooth knitr MASS R_utils RCurl rmarkdown Rsamtools S4Vectors seqinr stringr XML]; };
   hoardr = derive2 { name="hoardr"; version="0.5.2"; sha256="0m6wfs78jpxk2jnlqdbg5x7i993j70bvaxm643qhb8axwbq174c1"; depends=[digest R6 rappdirs]; };
-  hogsvdR = derive2 { name="hogsvdR"; version="0.1"; sha256="0ji4j9fzwnacdqbzrj5zphak5nsin7vcja15w48fik8hv5w6qs46"; depends=[MASS Rcpp RcppArmadillo]; };
   holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; depends=[]; };
   holodeck = derive2 { name="holodeck"; version="0.2.0"; sha256="1p7crpwa56a4363x4c888475xajga3blp544as4ad85br1k8vpjl"; depends=[assertthat dplyr MASS purrr rlang tibble]; };
   homals = derive2 { name="homals"; version="1.0-8"; sha256="0gad0jmflw5zmzf9hk5qqmxxpbncm9gngsi24i3rgiz7565kli1r"; depends=[ape rgl scatterplot3d]; };
@@ -8781,7 +8789,7 @@ in with self; {
   homomorpheR = derive2 { name="homomorpheR"; version="0.2-2"; sha256="1iahq16nswlc3b87598206xdp24bg9v8acyjp1jivybl3fr4k3pq"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
   hopbyhop = derive2 { name="hopbyhop"; version="3.41"; sha256="1dh502mjrk9dlqikn0ak4gh2dw9nrnp3zrz8j1xwa9cjn37al2wh"; depends=[ggplot2 pastecs]; };
-  hopit = derive2 { name="hopit"; version="0.10.2"; sha256="0iphvadn5shqlnk01xbz1vx13q453pkrs0nk1k5r1bmm2mr36kj1"; depends=[MASS Matrix Rcpp RcppEigen Rdpack survey]; };
+  hopit = derive2 { name="hopit"; version="0.10.3"; sha256="1dhfsbf4j2acncw0ypg44lkphhznafd80880jxfl6jdhd9fg2nn8"; depends=[MASS Matrix Rcpp RcppEigen Rdpack survey]; };
   horizon = derive2 { name="horizon"; version="1.2"; sha256="0b8m9ghfabjgdl155wh4gc4ng2lsvyfyhsy62pldbcix757b4ck9"; depends=[raster]; };
   hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
   horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; };
@@ -8794,12 +8802,13 @@ in with self; {
   hpa = derive2 { name="hpa"; version="1.0.1"; sha256="18055gh3nasdh6fh1xw95zl2vidqkw5b99b1zhh78j84lzs6r3gm"; depends=[Rcpp RcppArmadillo]; };
   hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; };
   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]; };
+  hpiR = derive2 { name="hpiR"; version="0.3.0"; sha256="0i15hmcf35kh16nrlc03y5jmrssr3k734s7vym7wbiwfy4x8d37b"; depends=[caret dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger 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=[]; };
   hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; };
   hrbrthemes = derive2 { name="hrbrthemes"; version="0.6.0"; sha256="0k6agxva3zqq3z9j8g7ismabvyr7j96qqidck23dgbgwgivjfkkq"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; };
+  hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; };
   hsdar = derive2 { name="hsdar"; version="1.0.0"; sha256="0lm92bznyhyfzjfd2j6bfqh78pa8qbwf1q7hai9880ghf99fz81m"; 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=[]; };
@@ -8808,7 +8817,7 @@ in with self; {
   hsstan = derive2 { name="hsstan"; version="0.6"; sha256="14k63agcq8m2lg5pw2309pi78950254v3z2m92pl4wjsikmsqrc1"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
   htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; };
-  htmlTable = derive2 { name="htmlTable"; version="1.13.2"; sha256="0h6jslchlx1dzqqdb70c3n9xlapcym9ykycvr0hc4q3450y8qmvh"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
+  htmlTable = derive2 { name="htmlTable"; version="1.13.3"; sha256="0g9r156k9yl1f092hfw3b9wjx11akf0shbi3x0d0mvpnflvc8nfl"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.4.0"; sha256="06l17d8jkf438yk2mchpsp4j90bynnapz3nabh5vkcc324p5a62v"; depends=[digest Rcpp rlang]; };
@@ -8835,7 +8844,7 @@ in with self; {
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.0"; sha256="1wwa1b96yglmnkvn209v8g0cvx567i2mxd7y6vjzzy5l428cf9f0"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; };
   hutils = derive2 { name="hutils"; version="1.5.1"; sha256="1x2x8gg2hdwxj1gz81pjls4y3yilssksirsbjnjd665rjs3jx7fj"; depends=[data_table fastmatch magrittr]; };
   hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; };
-  huxtable = derive2 { name="huxtable"; version="4.7.0"; sha256="0pnba6k8mnn6wi4inlcap3ir7w784sxnvfvrc6g4iwql5s3rz6cz"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; };
+  huxtable = derive2 { name="huxtable"; version="4.7.1"; sha256="0nkx6kpvh4z0fby7cv9bvripkqdha4f4c893h53a543q0ap06pjh"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
@@ -8853,19 +8862,19 @@ in with self; {
   hydroscoper = derive2 { name="hydroscoper"; version="1.2"; sha256="1aq35rz46ylkwlc6m55c73xyyrcx7p6mmvqj6sac9jdjwn74jvaj"; depends=[jsonlite pingr readr stringi stringr tibble]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.7"; sha256="16xrl94289kk1fb6pj0j8q8b40rmsm86fz2msmrmxh7mdp6hmxx9"; depends=[]; };
   hyfo = derive2 { name="hyfo"; version="1.4.0"; sha256="03xd4nm8zmc8gw8rml8svfim64xcslvpmdcldlri9cf89s8v35br"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
-  hyper_fit = derive2 { name="hyper.fit"; version="1.1.0"; sha256="0iylvjzgi0a9fblh331lc3h7f0m29xb70zwx0bjik0a4sisqx068"; depends=[LaplacesDemon magicaxis MASS rgl]; };
+  hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature 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]; };
+  hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200115"; sha256="19z65pc6fvgs7dl050fhvljs8ylwag2gdnsvdlniy7q3qr5mv16i"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat XML]; };
   hypercube = derive2 { name="hypercube"; version="0.2.0"; sha256="13b521vpxzk80ldr0v4bayxm4kwssqzpmzlykv5xhghvfdsqxqri"; depends=[dplyr plotly stringr]; };
   hypergate = derive2 { name="hypergate"; version="0.8.1"; sha256="17n8bs869c56jm76nq82alkajbyhbgn6nydzb1zh82i0ns269rlz"; 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.11"; sha256="1lfxsqvkzych9zvknxf4fnsfav9kv8cjss0pr4ny1wbmbvdxbbqc"; 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.12"; sha256="0jd49jncmg23vm9rkcy6sd4zjwlw75hwps7wahpb36zs9kb63ssq"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
   hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
-  hypr = derive2 { name="hypr"; version="0.1.4"; sha256="1a1dysa08v9q4sr8w3mr1lyj8fl1cdgqa00dnaa9pj6k81djr2qj"; depends=[MASS pracma]; };
+  hypr = derive2 { name="hypr"; version="0.1.5"; sha256="0xd4vy4zl0anxgisldxag5qciawcii4v41ix846gn16vd46npfrk"; depends=[MASS pracma]; };
   hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; };
   hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
   iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; };
@@ -8874,8 +8883,8 @@ in with self; {
   iBreakDown = derive2 { name="iBreakDown"; version="0.9.9"; sha256="1sxd2x837qmi47p0c9bmy1lqldv2l214qw5n28w3bkwalbdaizyk"; depends=[DALEX ggplot2]; };
   iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; };
-  iCARH = derive2 { name="iCARH"; version="2.0.0"; sha256="08krf7if4nlj7whchjqsr3gzvhz81w24wa2vxzs6znf9m0k5aqay"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
-  iCellR = derive2 { name="iCellR"; version="1.2.5"; sha256="1n5zp7k766q6xwvhw0w5s9x3ws9229pkdllh334bpxz3saj12s3r"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny umap]; };
+  iCARH = derive2 { name="iCARH"; version="2.0.1.1"; sha256="0722dfydq16vhdk7hrdwngkppq0g20ghak614jfnrfr6rnrn630s"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
+  iCellR = derive2 { name="iCellR"; version="1.2.9"; sha256="1bspcndcq6a2y3pnsfijp11pczxikbxy3m9jjznwfiisl8xcvqav"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; };
   iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; };
   iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
@@ -8886,11 +8895,9 @@ in with self; {
   iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
   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.2.0"; sha256="0hlhcdi0sgz5vqkaxphaj9ksc1lzyibs73zv4w849n66hm1p5w35"; depends=[]; };
+  iMRMC = derive2 { name="iMRMC"; version="1.2.1"; sha256="0n0i37cqj82cv5ksyva5pkwm5lasgpwljsqm692n4dkmkimc1wv9"; depends=[]; };
   iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; };
-  iNEXT = derive2 { name="iNEXT"; version="2.0.19"; sha256="1824icipyyb01s09z5fzygnyx2rgdcjlizps3agwsjj393aii4gj"; 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]; };
   iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; };
   iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
@@ -8904,7 +8911,7 @@ in with self; {
   iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
   iai = derive2 { name="iai"; version="1.1.0"; sha256="1ck5znn3l80ahh6n6qvp8rw4307blkqyr1jmq9ksifb5hkqpxyfw"; depends=[JuliaCall rlang stringr]; };
-  iarm = derive2 { name="iarm"; version="0.2.0"; sha256="0lg1q5z40hjm8wicniimv4wlb210qj7d5lmmknilzkpz4shwr44k"; depends=[eRm PP psychotools vcdExtra]; };
+  iarm = derive2 { name="iarm"; version="0.3.0"; sha256="0v5zb2pgzqb9brmq0calmghq20i8w3wx147781v4f6ll0abkhvxx"; depends=[eRm PP psychotools vcdExtra]; };
   ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; };
   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]; };
@@ -8928,20 +8935,20 @@ in with self; {
   icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; };
-  icenReg = derive2 { name="icenReg"; version="2.0.11"; sha256="1skppn8ncj91c9hmsv07qjr8xc3ylzrynbm9c950ayr4w15907hp"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
+  icenReg = derive2 { name="icenReg"; version="2.0.13"; sha256="1kyzvhcrmafprwdpc4dhjdg8dxf0zic4r22hzdnah9rfihds086l"; 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="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; };
   icesSAG = derive2 { name="icesSAG"; version="1.3-6"; sha256="08nlsvs23j7ax03gwld3ycyvhfrhs70jdjif3562q1ysgvvkbf45"; depends=[httr icesVocab openssl png xml2]; };
-  icesTAF = derive2 { name="icesTAF"; version="3.2-0"; sha256="11c4glpjqz6hdxmsbh7q4hyqps6xdj0ph3310dicwnxwymbp1dmx"; depends=[bibtex lattice remotes]; };
+  icesTAF = derive2 { name="icesTAF"; version="3.3-2"; sha256="113qbqpna6dvf9vrrnlapm0rix1fc1hawaa7jsa2rj7q4pbyijc7"; depends=[bibtex lattice]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-4"; sha256="0ydrxxmglgcsmjccamhfyw4cr2q583y4836v3wm2gxs5pcf9q86g"; 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.4.0"; sha256="01whs8wssjx3qgdnc1ixh59gvn1bajqm5q3zj1jpw1dqjh71qzf0"; depends=[httr purrr rvest]; };
   icr = derive2 { name="icr"; version="0.6.1"; sha256="1hmlh01p286zq26ya2x7hn4xba2g0q988pmvmxy6lfv0nigys0gs"; depends=[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]; };
+  idar = derive2 { name="idar"; version="1.1"; sha256="0nac7sav4rrp6a94aqgp8qyb22wg7y7gc5n1dhid894yc9z47a5f"; 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.7.2"; sha256="0nn7i6gr1ggk43xn9a454jbrxhqxw37srjvz4va0kcc02wy5pxq9"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools scales shinystan StanHeaders stringr svDialogs tidyr]; };
@@ -8950,9 +8957,9 @@ in with self; {
   idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
-  ideq = derive2 { name="ideq"; version="0.1.1"; sha256="1lp1mxckj4znngavv701mxcx84n9409irnpcsadj5v1grmy9352x"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; };
+  ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
-  idiogramFISH = derive2 { name="idiogramFISH"; version="1.9.1"; sha256="1rc378k8ngjcmhsz7hkpvyh2ayxyl3sk89y191assy8zx0i84p8v"; depends=[crayon dplyr plyr]; };
+  idiogramFISH = derive2 { name="idiogramFISH"; version="1.12.1"; sha256="0apmq28pb7wj4pyd3iv9872mq7bp5qrx5kiz9f6swlvr7mc0js1m"; depends=[crayon dplyr plyr]; };
   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]; };
   idmodelr = derive2 { name="idmodelr"; version="0.3.1"; sha256="147rlcm7dj20xbwi392w82m1mnw90mvcp4yjgfplm34z6y90ljir"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; };
@@ -8965,7 +8972,7 @@ in with self; {
   iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; };
   iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; };
   ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
-  ifaTools = derive2 { name="ifaTools"; version="0.19"; sha256="1g517assipy24nh44swkyz29q2l8gjg4ivhjzmxj2cc8n2xdfd5x"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
+  ifaTools = derive2 { name="ifaTools"; version="0.20"; sha256="0fkhnfnpa41z8hw72jgfqwgbfgzfqqnl8j2xwnqng1jymrwx97jv"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
   ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; };
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-5"; sha256="040kvbczcmmbaiaz0k0pdq9af541pjj6iwzh1a3w4szh9w6b5a3j"; depends=[MASS splus2R]; };
@@ -8980,16 +8987,15 @@ in with self; {
   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="2.0.4"; sha256="1jfvqn22v2rji8rnyjmpa2y3q14r514q2wdmh7ykiplvhlm9kyga"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; };
-  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-59"; sha256="096y589r1mrbvzax5i7sdczkl613kyn8g93qcddqb6jjljw03qmi"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
-  imagefluency = derive2 { name="imagefluency"; version="0.2.1"; sha256="1hb38gv8bj9fshcwp0vjqh29pi0ynmh4hj4hf3izrgqiiy42hvxf"; depends=[magick OpenImageR pracma quadprog R_utils readbitmap]; };
+  imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; depends=[magick OpenImageR pracma R_utils readbitmap]; };
   imagefx = derive2 { name="imagefx"; version="0.3.0"; sha256="1jw85kb2xxq1yzjnvpd8l5avvamyh12kimss7w31ry2wgsad2mdz"; depends=[moments signal]; };
   imager = derive2 { name="imager"; version="0.41.2"; sha256="19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
   imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; };
   imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; };
   imagine = derive2 { name="imagine"; version="1.5.2"; sha256="1k017a1qw7bahk1aif3ky7f1aynvrppmhvxbcmai646pmx99kbxn"; depends=[Rcpp]; };
-  imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; };
+  imbalance = derive2 { name="imbalance"; version="1.0.2"; sha256="1vkzxm8wb9g1mibnlp63gnky2gcgai5j09v63zki3jpxwxwli4nx"; 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.7"; sha256="1ch05d37gp0niml80k2apab1942aa05r77s52vgh2pfcx9kklv20"; depends=[dplyr httr jsonlite]; };
   imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; };
@@ -9000,20 +9006,21 @@ in with self; {
   immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
   immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; };
   imp4p = derive2 { name="imp4p"; version="0.8"; sha256="0k126zp38n1bw3q0b77smr6plpcim87i66amvwbv61w84ansgbv6"; depends=[Iso norm Rcpp truncnorm]; };
+  impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; };
   impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; };
   implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.0"; sha256="0j0mzsfli9m063nmy547jcwrzbdqs3m06k9jj4bjn8fdv45pabzk"; depends=[dplyr ggplot2 plyr qpdf tidyr xtable]; };
   implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; 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=[]; };
   importinegi = derive2 { name="importinegi"; version="1.0.0"; sha256="0rlnvc2m0cy5jqvylfbgg31dxpdsd37ca1bcpwcpgwcx3d3l373j"; depends=[data_table dplyr foreign haven rgdal]; };
-  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]; };
+  imputeFin = derive2 { name="imputeFin"; version="0.1.0"; sha256="1k61q4cd3j7rj0d35y3gyahjz4ac970m6mifc9pzxryi3w5373c4"; depends=[MASS zoo]; };
   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.1"; sha256="1xsawars52jhxfpl4hx8ghhndrvqk9vrrgajrrz2xrzi88kf6in2"; depends=[reshape2]; };
+  imputeR = derive2 { name="imputeR"; version="2.2"; sha256="0jfyl6k285x4lc58q13fhi004l4yaqas0d4g08rx78ml7p6l1r48"; depends=[reshape2]; };
   imputeTS = derive2 { name="imputeTS"; version="3.0"; sha256="0dr6mb2rzfkrm63j4mygf5kji12blycwl6bslbsb5fz64q5xc6dn"; depends=[forecast magrittr Rcpp stinepack]; };
   imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.3"; sha256="0yc1l3r7g7x2pgyli6j08ikvsbvr24kijnn7pdj54blw7c0pdmm2"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
@@ -9051,21 +9058,21 @@ in with self; {
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  ingredients = derive2 { name="ingredients"; version="0.4"; sha256="1sak7y80aq9blhr3gkxjdvfvpv49z39c40pl6gnh688qrlzz4csx"; depends=[DALEX ggplot2 gridExtra scales]; };
+  ingredients = derive2 { name="ingredients"; version="0.5.0"; sha256="1vq3ym3vvjz11ixi0ggmqggw7s88ha7kk1y6li5cpnsjiqqyv09k"; depends=[DALEX ggplot2 scales]; };
   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.12"; sha256="0ry32hsf9f4hd1jka51d7jbxlalhknwnc3zj9i9bggx38bb9w9fg"; depends=[ggplot2 Matrix rgdal rgeos sp]; };
   inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.4.8"; sha256="1zgpc4rfbx7l4hlaav3fyl68gd7xj8ff2fj1k4xy98jafi9j86mg"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; };
+  inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.4.9"; sha256="0yd8bysa5l3ihypckmx4g5zh176s6p4xsyw5pavc6pz8239wj5k2"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; };
   inops = derive2 { name="inops"; version="0.0.1"; sha256="1y402a9r542hpwd1nfdc07mbgnf9alpnykl9di1v8fy0qly8s0an"; depends=[]; };
-  inpdfr = derive2 { name="inpdfr"; version="0.1.8"; sha256="1xscrqkwl15l5r1sik6mnhzl868s9yxscm74sp740n3107md92hx"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
+  inpdfr = derive2 { name="inpdfr"; version="0.1.11"; sha256="1wnz73ggc7xcgynvdlvgz26qkfjmxxy0xg8gkf1far5346g4qd9y"; 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.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
-  insight = derive2 { name="insight"; version="0.7.1"; sha256="0scjmr8qvwaswb9wfq2lxp1v5fl72way8cid9agrf0z1agp0adad"; depends=[]; };
-  insol = derive2 { name="insol"; version="1.2"; sha256="14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"; depends=[raster rgdal]; };
+  insight = derive2 { name="insight"; version="0.8.0"; sha256="1bkcwvjpfy4q4k478x8x42yiqz6v0fk6z6hfp6fli3h63smlmck0"; depends=[]; };
+  insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; };
   inspectdf = derive2 { name="inspectdf"; version="0.0.7"; sha256="03yli2fiyb3kw189aga9hiyxm9f9b2lhpx1cjv9silfgm0xj54lh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
-  inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
   instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; };
   install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; };
   insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
@@ -9074,7 +9081,7 @@ 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="2.0.0"; sha256="0861skkr9rlldlck1r5gv206s7wlx06bg4hgfqfbwqfih83r5zpz"; depends=[alabama doParallel foreach MASS]; };
+  intccr = derive2 { name="intccr"; version="3.0.1"; sha256="1yp94cr59i120aqbzss48b4n6z29dcgd97qz06vnh812lfrj1wxd"; depends=[alabama doParallel foreach MASS]; };
   intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; };
   intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; };
   intePareto = derive2 { name="intePareto"; version="0.0.1"; sha256="0mynqvmdb39zqx1z2y6bscfjkwf880b7pd149xsdbc6f49hlnfw6"; depends=[apeglm biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; };
@@ -9094,9 +9101,9 @@ in with self; {
   interimApp = derive2 { name="interimApp"; version="0.0.1"; sha256="1g2f1plsgzqf277jy2afhchjlcamr9znm02rj4rvky7nnp63gph0"; depends=[interim shiny shinyBS]; };
   interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
-  interp = derive2 { name="interp"; version="1.0-32"; sha256="10ccsyz9wy31mdf58g7drifnb2zpbzcpk6pbffqxa6b0yxrmfwsa"; depends=[deldir Rcpp RcppEigen]; };
+  interp = derive2 { name="interp"; version="1.0-33"; sha256="115yz7vvlga24m5dz3kirr2vzh59ki3gypvxwvaab8zy2mqr47v6"; depends=[deldir Rcpp RcppEigen]; };
   interplot = derive2 { name="interplot"; version="0.2.2"; sha256="10licnz1x97ky7plq3j5gf23lg14jcx7bavv9mwib7p39ls5lagq"; depends=[abind arm dplyr ggplot2 gridExtra interactionTest purrr]; };
-  interpret = derive2 { name="interpret"; version="0.1.23"; sha256="06m35dmd029rrj762nqgxs6kj3zsz9k1b92idzyak1498i15xpxp"; depends=[]; };
+  interpret = derive2 { name="interpret"; version="0.1.24"; sha256="0nhxxcdw21qi356nxs0abp2fv87izs3667rw774251r9sbpq5vn1"; depends=[]; };
   interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; };
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
   intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; };
@@ -9107,7 +9114,7 @@ in with self; {
   intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; 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=[]; };
-  intsurv = derive2 { name="intsurv"; version="0.2.0"; sha256="1y6q7jyb5f01w3z7slwlpjz89m4vl77jg1pw4lab8q0aw27kfrfd"; depends=[Rcpp RcppArmadillo]; };
+  intsurv = derive2 { name="intsurv"; version="0.2.1"; sha256="1vkqxd08g2mbci3g543d1cil890ia39bp6yv86l5jdh5ry9174pc"; depends=[Rcpp RcppArmadillo]; };
   intsurvbin = derive2 { name="intsurvbin"; version="0.0.4"; sha256="119zjn1agl2j4fj4yg1pq1sqskzw93xfzppmc5n1x8llmfbxkqsj"; depends=[mgcv MHadaptive msm mvtnorm tmvtnorm]; };
   intsvy = derive2 { name="intsvy"; version="2.4"; sha256="19anm90rqhvdv0fsr2hbzkwsr3zc7pimq4gcg2mgj06gxqbwhym7"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
@@ -9119,7 +9126,7 @@ in with self; {
   inverseRegex = derive2 { name="inverseRegex"; version="0.1.0"; sha256="1wk3ac2rfy0m8442sa2m75s6l3wadx4d4cwas6c8n2xqkrphci87"; depends=[]; };
   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]; };
+  io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; };
   ioanalysis = derive2 { name="ioanalysis"; version="0.2.1"; sha256="14bmi6kk8ra9b7px3l98sdm1zjr8516cfkya8fpdfbaxqjdv4byj"; depends=[ggplot2 plot3D]; };
   ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
@@ -9132,24 +9139,24 @@ in with self; {
   ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; };
   ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.3"; sha256="1pqlfkglgsahzsw7z9wsx7k0i9n0kx77g9p1j7i9dz7j74s6g09r"; depends=[survival]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
-  ipdw = derive2 { name="ipdw"; version="0.2-7"; sha256="1g4chjzl0xcxf7mfhazy8h2dvzz73sljdbl1w79sx0pjcjagvs3l"; depends=[gdistance raster rgeos sp]; };
+  ipdw = derive2 { name="ipdw"; version="0.2-8"; sha256="0a277r3v9b5as6sdmzqnx8a7iqhbb700iwy1xsl9d6hmrn16mi3n"; depends=[gdistance raster rgeos sp]; };
   ipeadatar = derive2 { name="ipeadatar"; version="0.1.0"; sha256="1qg67xmp9x5yv1gm0k6czycg89rpfa8cscrihmqibhscp5dansnj"; depends=[curl dplyr jsonlite lubridate magrittr purrr sjlabelled]; };
-  ipflasso = derive2 { name="ipflasso"; version="0.2"; sha256="1awwwycad7bvpnnla5v5aqjqisxwc0wmc6wvs3k2gr4hcrkkcbcw"; depends=[glmnet survival]; };
+  ipflasso = derive2 { name="ipflasso"; version="1.1"; sha256="0gf1yj35vr92qi59hffcf4hzrh2b439kfd6m745wgpxq6wic1hs3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
-  ipfr = derive2 { name="ipfr"; version="1.0.0"; sha256="1rfzpssjb3mnky03zhzgah0h1fccda0aq8idpg22pxf4sk09pg9p"; depends=[dplyr ggplot2 magrittr mlr tidyr]; };
+  ipfr = derive2 { name="ipfr"; version="1.0.1"; sha256="1gd2nh88xip7dw5sfb79b4g3jhhkzrqwii1vczcjdnghbk0yp96r"; depends=[dplyr ggplot2 magrittr mlr tidyr]; };
   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]; };
   ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; };
   ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; };
   iprior = derive2 { name="iprior"; version="0.7.3"; sha256="15qzqwikxy85fcd7psz363b5wb0kpi85icfyb47hbgdhln8fi2qb"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; };
   ips = derive2 { name="ips"; version="0.0.11"; sha256="02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"; depends=[ape phangorn plyr seqinr XML]; };
-  iptmnetr = derive2 { name="iptmnetr"; version="0.1.6"; sha256="1hahsmb9lk8ml1z8yfin2qswb2rskqbdzf3ndzddqyixf585vsaa"; depends=[httr jsonlite]; };
+  iptmnetr = derive2 { name="iptmnetr"; version="0.1.8"; sha256="040ym8560x0yzn9m0pb3awhcpjmsaj66vlqhmgha6mzd140wpqra"; depends=[httr jsonlite]; };
   iptools = derive2 { name="iptools"; version="0.6.1"; sha256="143gawwp3aja5vycl43n6x5hzg3yvagi8x10v9y92hkif9v075qq"; depends=[AsioHeaders BH Rcpp readr stringi triebeard]; };
   ipumsr = derive2 { name="ipumsr"; version="0.4.2"; sha256="1y1s1grmfkaax04i9ig57lv1l64hcwdn420kv1w51f3jh28hbdgg"; depends=[cli crayon dplyr haven hipread pillar purrr R6 raster Rcpp readr rlang tibble tidyselect xml2 zeallot]; };
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   ipwCoxCSV = derive2 { name="ipwCoxCSV"; version="1.0"; sha256="0avnvf4pnpxnik3iwwglpwkc8h0vsx9v6fxldkbvq7l9bphdbba1"; depends=[survival]; };
   ipwErrorY = derive2 { name="ipwErrorY"; version="2.1"; sha256="14p22mwc120kdlf6r1hfx4kp7nqrz2nl2vpvy45j8rbrc571b6ka"; depends=[nleqslv]; };
-  iq = derive2 { name="iq"; version="1.1"; sha256="0i0i9xc0mdz026gg3iqyyjplvn8b3di045j3h6iiis2gwjswi6pr"; depends=[]; };
+  iq = derive2 { name="iq"; version="1.3"; sha256="1bs5gmj0vc396pc6ybmfq2wmv4hfn6lbiyqzdsr4zq01r4y4iwgs"; depends=[]; };
   iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; };
   irace = derive2 { name="irace"; version="3.3"; sha256="040d1cl8q5hmcji66bvgvm9wb8w6v7xzfsggbrar8490s9ldjhj4"; depends=[]; };
   ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
@@ -9176,16 +9183,18 @@ in with self; {
   isni = derive2 { name="isni"; version="1.1"; sha256="0m7z8gxam4f3d0ggyk502c42aaxvjanxcv5c1p62jv13vgb0jrik"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; };
   isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; };
   isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; };
-  isocat = derive2 { name="isocat"; version="0.2.3"; sha256="162pgvqdra1pbcdlm66088d1hgjcgqm8m61l3l6pr0023m1yic5v"; depends=[dplyr foreach magrittr plyr raster sp]; };
+  isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; };
+  isocat = derive2 { name="isocat"; version="0.2.4"; sha256="0hbkkzcsw7hy40jilb4dahckxi8wfrcvpzrlbfigsc2hdlgm7591"; depends=[dplyr foreach magrittr plyr raster sp]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
   isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
   isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
+  isotree = derive2 { name="isotree"; version="0.1.8"; sha256="043bxl7qfwwh6pirbk65rjb81bk6xmg5isqf9p3bygjpa910pqfi"; depends=[Rcereal Rcpp]; };
   ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; };
   isqg = derive2 { name="isqg"; version="1.2"; sha256="1g4nwngljx6sp2k29pn2v8zgp2nh61w75bg36ihlq093hiq6w7gd"; depends=[BH R6 Rcpp]; };
-  istacr = derive2 { name="istacr"; version="0.1.0"; sha256="0vzf4zvh4qk7nflndmicz510859hh6sxwh0agwzygg80pbdrf02c"; depends=[curl jsonlite]; };
+  istacr = derive2 { name="istacr"; version="0.1.1"; sha256="0mpsy9pc0hi1mpyc3jx2wzpijzrzlla5yxhi6vciwlfibdgi8dhk"; depends=[curl jsonlite]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
   italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
@@ -9194,10 +9203,9 @@ in with self; {
   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.12"; sha256="0jwzxaa3jm1xzgfv5pn0xqkk7rhm0xwvgn85w7xaw8xx1vb33gwn"; depends=[]; };
-  iterpc = derive2 { name="iterpc"; version="0.4.1"; sha256="0q08bdr5v849z2431f2sdh9f7aagjxm34si0kn0bp85dnlqri8rx"; depends=[arrangements gmp iterators]; };
+  iterpc = derive2 { name="iterpc"; version="0.4.2"; sha256="06q7l8mz8ws4nn6gb0whnlqs8my2n8z2d2g8fvv3cxd28904dg9q"; 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=[]; };
   its_analysis = derive2 { name="its.analysis"; version="1.4.1"; sha256="0f3wn7d3j6c0hhg2gp439y5m3namlswgdln18xxbvzzr4s8kz0wx"; depends=[boot car forecast ggplot2 plyr]; };
   itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; };
   itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; };
@@ -9216,7 +9224,7 @@ in with self; {
   jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; };
-  jabr = derive2 { name="jabr"; version="0.1.0"; sha256="0c8ihffwgj14phbl51cabk2jcnnxipqlbsxq73yvg57a8vj6yj24"; depends=[ckanr dplyr glue httr magrittr purrr rappdirs rlang stringr tibble tidyr]; };
+  jabr = derive2 { name="jabr"; version="0.1.2"; sha256="19hcg2jn7vxmnqwq1828396pgnq53nyw30s19rhy1d7rk5k7dy1p"; depends=[ckanr dplyr glue httr magrittr pillar purrr rappdirs rlang stringr tibble tidyr]; };
   jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; };
   jack = derive2 { name="jack"; version="1.1.1"; sha256="1mp7cfmh3bzfansb3dyqq347qk6kkf4ndn23pbd78h1xcb54555b"; depends=[DescTools gmp multicool mvp partitions]; };
   jackalope = derive2 { name="jackalope"; version="1.0.0"; sha256="1v2n8ip0nfrdpd263yvr9jnmz9yx9m76vdwds18wj8504y95fzcv"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; };
@@ -9238,10 +9246,11 @@ in with self; {
   jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; };
   jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  jiebaR = derive2 { name="jiebaR"; version="0.10.99"; sha256="0gk5plifahwjrqkd3nqlcjhbkzw3gdkkxydrdmlh1lsrys2z54f6"; depends=[jiebaRD Rcpp]; };
+  jfa = derive2 { name="jfa"; version="0.1.0"; sha256="13fhxzhaq29z1kbaf4y9gb1m3706gvd2wsann9kz2mbpa2p9jk3a"; depends=[]; };
+  jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
   jipApprox = derive2 { name="jipApprox"; version="0.1.2"; sha256="09xvcf9sjf5xzrwpzicgln57ldv6kh1algsiq4kc0hnshmfvk56g"; depends=[sampling]; };
-  jjb = derive2 { name="jjb"; version="0.1.0"; sha256="0izpvban8v85g6w2mnmimhdh4yg6kcaf046v3jjba368nsj67q9n"; depends=[]; };
+  jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; };
   jlctree = derive2 { name="jlctree"; version="0.0.1"; sha256="17n39jc7cwv6hiayy7h1859prdwy2j3pz1vhi6jqnzm4wy6p8a9a"; depends=[lme4 rpart survival]; };
   jmcm = derive2 { name="jmcm"; version="0.2.1"; sha256="1giyd0agjz1qpgj7q55maxk7jjmpwc3mrj02ailvwl44rdvhl90v"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; };
   jmdem = derive2 { name="jmdem"; version="1.0"; sha256="1qz2l02m4gnxrm1ankr5qqlskl8amphzj8r763yas218fvzfa34q"; depends=[statmod VGAM]; };
@@ -9254,7 +9263,6 @@ in with self; {
   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]; };
   joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; };
   joint_Cox = derive2 { name="joint.Cox"; version="3.7"; sha256="1h9cqmly5rrrqvxzkx5fxjaqzks9hpvb2ggaw8b5rn67wbyblrl9"; depends=[survival]; };
@@ -9270,7 +9278,7 @@ in with self; {
   jpmesh = derive2 { name="jpmesh"; version="1.1.3"; sha256="0ybv19bmrcwzan151p4px0vv6qnaqmk4fgqvqlh4syjnrb6xv0c5"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; };
   jpndistrict = derive2 { name="jpndistrict"; version="0.3.4"; sha256="1z1rgqibksxrz0048zk78xlsm595jbm3y6xkrqcifm1xnqgh1fys"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; };
   jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; };
-  jrc = derive2 { name="jrc"; version="0.2.1"; sha256="1izyl787p3n36mrsk3bz16lxykf29140w7cj7mk0lg03qa8fx3cd"; depends=[httpuv jsonlite mime stringi stringr]; };
+  jrc = derive2 { name="jrc"; version="0.3.0"; sha256="1sa6rpmnj48mlwz5h5nfvq4h3yi64bbh5lkxmhs5lc2x03a6nqd6"; depends=[httpuv jsonlite mime R6 stringi stringr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; };
@@ -9285,7 +9293,7 @@ in with self; {
   jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; };
   jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; };
-  jstable = derive2 { name="jstable"; version="0.9.0"; sha256="1qfqz6lisl6pksxfb0anqcm4m01ljr2nscz2f1agcpimrwlcmgvr"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
+  jstable = derive2 { name="jstable"; version="0.9.2"; sha256="0vp6bb2yqnh81avy085y6ylb3qll671xmjddi6gilzmbxpks9xl6"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
   jstor = derive2 { name="jstor"; version="0.3.7"; sha256="0if7ngqs9ncnkg9kiag3k51ipxiyrkaqm7lzmvp84hysqq8536jc"; 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="2.0.1"; sha256="03c3nii7il8wjdpv99xqlbpf12hjpw7ni4vdqxmkffybra6c97nx"; depends=[crayon ggplot2 magrittr pander pkgconfig rlang tibble]; };
@@ -9310,7 +9318,7 @@ in with self; {
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
   kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
   karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; };
-  kayadata = derive2 { name="kayadata"; version="0.4.2"; sha256="198wa3bzvgk97b65v11nnbdw0myyricy0ig4b52n3m5ib9781snm"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; };
+  kayadata = derive2 { name="kayadata"; version="0.4.3"; sha256="116bcjfsq9k4x6dy92xbs18rlc09wcwylqyni0dw4c8pww64n937"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; };
   kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
   kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; };
@@ -9329,13 +9337,12 @@ in with self; {
   kequate = derive2 { name="kequate"; version="1.6.2"; sha256="08p2dv5swp5458n9sx262s330cj8iy86vr6d8989mjzfys2jyb4q"; depends=[equateIRT ltm mirt]; };
   keras = derive2 { name="keras"; version="2.2.5.0"; sha256="14a1mhx95446s8smd4s7adzlmpzx18kqsbgzva4gbya1b48bkw3l"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
-  kerasformula = derive2 { name="kerasformula"; version="1.5.1"; sha256="1b4mq1y41lz8maszlrm7w907vcz7in8napfnhas7dgal1kid4mcf"; depends=[dplyr ggplot2 keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
   kergp = derive2 { name="kergp"; version="0.5.0"; sha256="000hs9mi22k0wyafnj5a3vnhfq9la0s159afnd9133bjx0l6q2g7"; depends=[doFuture doParallel lattice 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]; };
-  kernelPSI = derive2 { name="kernelPSI"; version="1.1.0"; sha256="09fdh3zgc13a6i66kw9qmsy8wa7mq7359ym3srf5dzv57hz9x8md"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; };
+  kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; };
   kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.6"; sha256="151jksyd316wdlinzikpik9g4x4qnqyl87sg4lbdnzq6w35c5j38"; depends=[future future_apply Rcpp]; };
   kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; };
@@ -9344,7 +9351,7 @@ in with self; {
   kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; };
   keyholder = derive2 { name="keyholder"; version="0.1.3"; sha256="0r45wd36bf3ir3j3llcy40w6l8440ncvx3c1f6qvb8zgl4bl6z22"; depends=[dplyr rlang tibble]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
-  keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
+  keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; };
   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]; };
@@ -9362,12 +9369,11 @@ in with self; {
   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.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; };
-  kiwisR = derive2 { name="kiwisR"; version="0.1.7"; sha256="0xyrxk8109s1wfbacfjip0ch77jbhb4y8rqxz4cyml4l5kyw4zf6"; depends=[dplyr httr jsonlite lubridate tibble]; };
+  kiwisR = derive2 { name="kiwisR"; version="0.1.8"; sha256="0nncb1xvic0gmj4gllsk1lgwsizlq3vsnifjcf4dp716iik0h0sr"; depends=[dplyr httr jsonlite lubridate purrr tibble]; };
   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]; };
   klassR = derive2 { name="klassR"; version="0.1.2"; sha256="1wfgqy4pfbaikm0qqf6dirjw0imbl6si9i0nwn8l17i7c8g8g55s"; depends=[httr jsonlite tm]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
-  klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
   klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; };
   km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
   kmc = derive2 { name="kmc"; version="0.2-3"; sha256="0r1zm8r51zijv67d0dri7mg5z5ihy7h1n16kpf7ap9ravkc8zbik"; depends=[emplik Rcpp rootSolve]; };
@@ -9384,16 +9390,16 @@ in with self; {
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.26"; sha256="08f3bdd5cnnbigybr9vmkhq12n64pbmn4layl3w5rwk8xi5kbnrq"; depends=[evaluate highr markdown stringr xfun yaml]; };
+  knitr = derive2 { name="knitr"; version="1.27"; sha256="02nysgnx6xv0kd351s1d59yx4g0drsd9lmcgxs0rsw5f1jiycgdg"; depends=[evaluate highr markdown stringr xfun yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; };
   knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
   knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   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]; };
+  knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; };
   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]; };
+  knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.2"; sha256="0y2is6ww13dzkm9p7wl8n5rmbcx4qlnzhbidc1h6bg75r5anpphq"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; };
   koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; };
@@ -9403,8 +9409,7 @@ in with self; {
   kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[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.3.1"; sha256="1nnn0gzqcy0551i7ylgnmcxff3g06w9y0s3bwmdrdc1bcavbb0ic"; depends=[rmarkdown]; };
+  komaletter = derive2 { name="komaletter"; version="0.3.2"; sha256="0gw86j9fvklz2x9hcl4h3kxjjki5fagmh2dskkpvabmgpk3725z1"; depends=[rmarkdown]; };
   konfound = derive2 { name="konfound"; version="0.1.2"; sha256="1sza54hvg16jxrl37zmsrqvdlxjqhyd0kaxpb9fqd7rkbjqdp0m2"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; };
   kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
@@ -9414,7 +9419,7 @@ in with self; {
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
   krige = derive2 { name="krige"; version="0.3-1"; sha256="1dxn9prl79ln0m5dlwh62m553lrah1w1kwix02xafhiawl4rxp40"; depends=[MASS mvtnorm]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
-  krm = derive2 { name="krm"; version="2018.8-17"; sha256="0d4isfzhlz9kxq0sbb1m60wnvcnlqzz8d45hiikgf1dfbngkyh2a"; depends=[kyotil]; };
+  krm = derive2 { name="krm"; version="2019.12-11"; sha256="1dzgvj30bjq4af0470hyxad6bf1y676wk789gqf8rgfwywkk8rr6"; depends=[kyotil]; };
   ks = derive2 { name="ks"; version="1.11.6"; sha256="0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; };
   ksNN = derive2 { name="ksNN"; version="0.1.2"; sha256="06x471hck95xqy7rbh53ibhzh6kfjra7y9ipqdj2rqdkmfdj72q8"; depends=[Rcpp]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
@@ -9465,33 +9470,33 @@ in with self; {
   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]; };
+  landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
-  landscapemetrics = derive2 { name="landscapemetrics"; version="1.3"; sha256="1x7fm6gs9pxkcbj182w2cfpsp9bg2chgc9pg7w0hbydz3fnv8whx"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.2"; sha256="04hv1v4nzvsnvhl1sdsvi4ga6kajj5qipyxyqw4y9ps3h1iw1c41"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
   landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; };
   landsepi = derive2 { name="landsepi"; version="0.0.8"; sha256="0k2hkrj0r3hx5jvmgx852s030md3cqhm7yixl0xxlkxwqrylw7qc"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; };
-  languageserver = derive2 { name="languageserver"; version="0.3.2"; sha256="1sd2c9a0fqk4yag5cmzpnpkqi5nqq4gnzyv268vq9ch60pm610km"; depends=[callr collections desc jsonlite lintr R6 readr repr stringr styler xml2 xmlparsedata]; };
+  languageserver = derive2 { name="languageserver"; version="0.3.3"; sha256="16x5a63x49xzgh32sqxfriabax45ng01vmr5i1srp30am55sxa18"; depends=[callr collections desc jsonlite lintr R6 readr repr stringr styler xml2 xmlparsedata]; };
   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=[]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
-  lass0 = derive2 { name="lass0"; version="1.0.0"; sha256="05q3d14rxkz9cbavkrnnw09nd5vsf9n5j295dnifhqr9il27npmn"; depends=[foreach ismev lpSolve]; };
+  lass0 = derive2 { name="lass0"; version="1.1.0"; sha256="01fafgyhi3fw8ldjw2gf0z9w1si7il3ailwm197fxmw4wqgys9fl"; depends=[doRNG foreach ismev lpSolve]; };
   lasso2 = derive2 { name="lasso2"; version="1.2-20"; sha256="0wgby86i5jphl1nxhzf6733lknry843qrqiyp4km10s2nlpbls0c"; depends=[]; };
   lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   latdiag = derive2 { name="latdiag"; version="0.2-4"; sha256="051chvky3hlfr4hwm9qickl6aaxwnxa88zksmzczqfspby771hq6"; depends=[]; };
-  latentnet = derive2 { name="latentnet"; version="2.9.0"; sha256="0gmv4h6zijhgypkasr1y45lx7ksfhfpdgrqqxan4qnxfqp3kxbrr"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
+  latentnet = derive2 { name="latentnet"; version="2.10.1"; sha256="1xabby9b5idbs2q04shg05sw26mnrvc3dsngcdrcz7s2crz9mr57"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
   later = derive2 { name="later"; version="1.0.0"; sha256="11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; };
   latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; };
   lattice = derive2 { name="lattice"; version="0.20-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; };
-  latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
+  latticeExtra = derive2 { name="latticeExtra"; version="0.6-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; };
   lava = derive2 { name="lava"; version="1.6.6"; sha256="0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"; 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.5.4"; sha256="0zq5i568pd0xwjbxwi0ndhmjxglyd9y2x8yfvnrmg3pq1wxqys6h"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; };
@@ -9501,7 +9506,7 @@ in with self; {
   lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; };
   lawn = derive2 { name="lawn"; version="0.5.0"; sha256="0yvlps6g9ya383615y7x624hnwb6qfs6i5yg4cchp6lkvz2xdd5y"; depends=[jsonlite magrittr V8]; };
   lawstat = derive2 { name="lawstat"; version="3.3"; sha256="117w8b1skw9kh03dm67p17q6ifyh3zq2ivm85ix1nvpyrq3pcfvp"; depends=[Kendall mvtnorm Rdpack VGAM]; };
-  lax = derive2 { name="lax"; version="1.0.0"; sha256="1c386hx83i344byc6p77whz71kgwbjzqpgm6y6ykila06lsp7fip"; depends=[chandwich numDeriv revdbayes sandwich]; };
+  lax = derive2 { name="lax"; version="1.1.0"; sha256="0awk5qg339fvx7vdln0xzc1yz8h0dxgq7ypbmak41ddfqkyjhf9a"; depends=[chandwich numDeriv revdbayes sandwich]; };
   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]; };
@@ -9509,30 +9514,31 @@ in with self; {
   lazyraster = derive2 { name="lazyraster"; version="0.5.0"; sha256="0zf9xlxyzmgxy1nl2kg7fvpfamjz04gf4yxjn3r9j7fjkik35cnp"; depends=[quadmesh raster vapour]; };
   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]; };
-  lazytrade = derive2 { name="lazytrade"; version="0.3.6"; sha256="11yd2x6ya3vgzy7lx3gxqz1q115wmb4aw0s1c6jyhkkqlf3rbyw4"; depends=[dplyr h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; };
+  lazytrade = derive2 { name="lazytrade"; version="0.3.9"; sha256="1lms83qf0vpflszxjzpxrsr7991lkzqr1ch9ivx70anjaaijgql3"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; };
   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.1"; sha256="15g465dy4izybmgmbgzmiyaxdfa6l1mcvyh6rc3hgapnlmnvb66m"; depends=[numDeriv]; };
   lbfgsb3c = derive2 { name="lbfgsb3c"; version="2019-11.26"; sha256="1wp4vhagh1pvvg6v7gayj7ljicipaa3jz4wbnml4fnzpwzp0irgv"; 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]; };
+  lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; };
   lcc = derive2 { name="lcc"; version="1.0.3"; sha256="0jvih9j6r8q26m3rjzng6sn2l41n5hgfsg2w298ac1v6asv3a1kn"; depends=[gdata ggplot2 gridExtra hnp nlme]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
   lcmm = derive2 { name="lcmm"; version="1.8.1"; sha256="1n7g4m8r8n2zi53ah35gn0nx666fh6brbysgbsyb2yv4hjrf5v08"; depends=[survival]; };
   lconnect = derive2 { name="lconnect"; version="0.1.0"; sha256="0wk1kx0awj6d9w4sn0csws0sksx9cb4b4l9xpjqnyavc4zfhxj8l"; depends=[igraph sf]; };
   lcopula = derive2 { name="lcopula"; version="1.0.4"; sha256="11rjymm4zj3brifzrrfwqv9v8rzkzqk072xlzyjxm2p08dd11xxb"; depends=[copula pcaPP Rcpp]; };
-  lcpm = derive2 { name="lcpm"; version="0.1.0"; sha256="1miyq9pxwbn6l9099dbb5i4fnrjrnyj9yq5j6lv76bv7ih1kxp4a"; depends=[Matrix numDeriv plyr]; };
+  lcpm = derive2 { name="lcpm"; version="0.1.1"; sha256="0pqmizli5rhyaxvxrjycf8d5kqrm23i3vdz00r8zmijjpiz2p9s2"; depends=[Matrix numDeriv plyr]; };
   lctools = derive2 { name="lctools"; version="0.2-7"; sha256="1pllm5jf9mpy4nf4bn4vifhr173kddabzybjwq4rg9cni92zm3dn"; depends=[MASS pscl reshape weights]; };
   lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
   lda_svi = derive2 { name="lda.svi"; version="0.1.0"; sha256="1x72zqks8163qpmld21n5vn5q3jazp6g54arf53038rd0c59191q"; depends=[BH Rcpp RcppArmadillo Rdpack reshape2 tm]; };
+  ldaPrototype = derive2 { name="ldaPrototype"; version="0.1.1"; sha256="0r78x7sn6mg4hgwydk1lgvfzkmgwkzqq0kvn8pqawx9pg8d8h4jb"; depends=[checkmate colorspace data_table dendextend fs lda progress]; };
   ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
-  ldat = derive2 { name="ldat"; version="0.2.0"; sha256="04l544js7xzaywd2mj3kcz40gxn98primzmzd1ihk35lqmpd7h8y"; depends=[BH lvec Rcpp]; };
+  ldat = derive2 { name="ldat"; version="0.3.0"; sha256="1bmj5pwkj89mkha74lash4j24b7mj1c7q9as3c4pi5pk4m2s7xwl"; depends=[BH lvec Rcpp]; };
   ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; 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.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; };
-  ldhmm = derive2 { name="ldhmm"; version="0.4.5"; sha256="1pax1hl0h07nc9d34pf0jqgpcxr7y7dpqcm2hlclrmsinhj9q8vi"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
+  ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; 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=[]; };
@@ -9547,14 +9553,13 @@ in with self; {
   leaflet_providers = derive2 { name="leaflet.providers"; version="1.9.0"; sha256="0yynrwv4xd5cdh49cwvfxm4ranarah9iiry2cd3b4fiihdfcg3wy"; depends=[]; };
   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]; };
-  leaflethex = derive2 { name="leaflethex"; version="0.1.0"; sha256="0wdph5xs2n7brdj7x1kgza0vxghl519hmva5xzkjc2yaj2dkpyrk"; depends=[dplyr htmltools htmlwidgets leaflet readr tibble]; };
   leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; };
-  leafpop = derive2 { name="leafpop"; version="0.0.1"; sha256="1bcab4f0g9xf7w5zh9xma93lv9ywbn9zqdy46k7cm0y6vnzggsy8"; depends=[base64enc brew gdalUtils htmlwidgets Rcpp svglite uuid]; };
+  leafpop = derive2 { name="leafpop"; version="0.0.5"; sha256="0mv04inb7glv69baq6xwdm2rnk9mihjz0rgd4zw6qyxnf03lhh06"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; };
   leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; };
   leaftime = derive2 { name="leaftime"; version="0.1.2"; sha256="0a653h0lhdw10j9yv0jsvaivj09fz1cjg3z9g3caja6c83w5c65q"; depends=[geojsonio htmltools htmlwidgets leaflet]; };
   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=[]; };
+  leaps = derive2 { name="leaps"; version="3.1"; sha256="1dn3yl1p03n0iynd1vsdkrr0fhmvgrmfkv37y7n371765h83lz1x"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
   learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; };
   learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; };
@@ -9565,26 +9570,24 @@ in with self; {
   leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
   legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; };
-  leiden = derive2 { name="leiden"; version="0.3.1"; sha256="19gq27zin4gf4sh7h24gyq3f8jjir20n2l36a7pk1pbzcr4ixyhp"; depends=[igraph Matrix reticulate]; };
+  leiden = derive2 { name="leiden"; version="0.3.2"; sha256="0kf6fxqf5l5vilm9g7vspc18daw84cwhpafs5szb1skwd6vrfdzw"; depends=[igraph Matrix reticulate]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
   lemon = derive2 { name="lemon"; version="0.4.3"; sha256="0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; };
   lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; };
   leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; };
   lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.8.9"; sha256="00k1ar4nnsj89zvsqp3b0nwyiwbprpgznzkn53d0csgrm473lwyf"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
+  lessR = derive2 { name="lessR"; version="3.9.0"; sha256="1sia0x9rlfy0p7ilpkb32klv5ydd6jgqcl8n877d1m6xn947fy0z"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
   lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; 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]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; };
   lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; 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.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; };
-  lfe = derive2 { name="lfe"; version="2.8-3"; sha256="0hpgk0k0xq47p71002xvl9p9xhw5yv9vsh0c4xyg1sjd5mdvhvy4"; depends=[Formula Matrix sandwich xtable]; };
+  lfe = derive2 { name="lfe"; version="2.8-5"; sha256="1hi3jw2s0xwly5lbvhs8ysm9ky69sixzcf7z6fwlsn9lsdrwb07x"; 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.4.0"; sha256="0m4jsvqrf1l41qlwl6g4w0f8v5gsfqniakz2xl263jj0l5micwf6"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
-  lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
+  lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; };
   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]; };
   lgr = derive2 { name="lgr"; version="0.3.3"; sha256="1ivab8vw4bp206yq21dz7ix3slghjdzh4k6q6w9xpvphwscx0h48"; depends=[R6]; };
@@ -9598,7 +9601,7 @@ in with self; {
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; };
-  lidR = derive2 { name="lidR"; version="2.1.4"; sha256="0qn2rf6h5ybx1qqri0cnb24iyylfv9hy8qm1lsbibssway9v8as2"; depends=[BH data_table future gdalUtils geometry glue imager lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
+  lidR = derive2 { name="lidR"; version="2.2.1"; sha256="1yg26r6rhjl44k2x3magij2gn30z7w8vr3njhrwqgmawhgvg0dqq"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifecycle = derive2 { name="lifecycle"; version="0.1.0"; sha256="11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"; depends=[glue rlang]; };
@@ -9632,7 +9635,7 @@ in with self; {
   lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; };
   lingtypology = derive2 { name="lingtypology"; version="1.0.15"; sha256="1iy33d29fdwpsw13094ykjijidhpcgkxqdqxfmlw4s6ma08sx4gh"; depends=[leaflet leaflet_minicharts rowr stringdist]; };
   linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; };
-  link2GI = derive2 { name="link2GI"; version="0.4-0"; sha256="00cvakpyl8jmj3d3lyap6b22kav6dkqj0r24w2h6nn5w9b9j3max"; depends=[devtools R_utils roxygen2 sf stringr]; };
+  link2GI = derive2 { name="link2GI"; version="0.4.1"; sha256="1frxm3xyz9bjym4h95bnwgmvgix6n8jz1bvg3pvhxczb2qld52wb"; depends=[devtools R_utils roxygen2 sf stringr]; };
   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=[]; };
@@ -9641,7 +9644,7 @@ in with self; {
   linl = derive2 { name="linl"; version="0.0.4"; sha256="1wq0wm3k12sfvg0nzdsdxb4qc79kny7qvckxplfgaj6y62vcjxxl"; 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.2"; sha256="18layj6a202p0sy9rs022fp0a6fwvixwwmwlyzn7h9kh4y9gvxjz"; depends=[]; };
+  lintools = derive2 { name="lintools"; version="0.1.3"; sha256="1wv94j0j89zq15b80x0cylfxar5ajrdrcdn62mkgjij3m8zqs7fa"; depends=[]; };
   lintr = derive2 { name="lintr"; version="2.0.0"; sha256="09gbci4v5n4gsfzminly8332fw7faxdi1kkyvpa10dydx02sjcwb"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi stringdist testthat xml2 xmlparsedata]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; };
@@ -9651,16 +9654,16 @@ in with self; {
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
   list = derive2 { name="list"; version="9.1"; sha256="17d8pscn56wlp6pcz2mvqjmrwv22fhphiiblrnfnd36m65nd58dm"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
   listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; };
-  listarrays = derive2 { name="listarrays"; version="0.2.0"; sha256="0hm8b9pkrqzgs88vba0y4xd12fzjcdr3n1san7wm88wy7pkl6kx5"; depends=[]; };
+  listarrays = derive2 { name="listarrays"; version="0.3.0"; sha256="0y3485wcirr7srjn4ahx0ym3z9y4a66v6g1pyb6czxzj1wi0i0sn"; depends=[]; };
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
-  listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; };
+  listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; };
   listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
   listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; };
   liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; };
-  litteR = derive2 { name="litteR"; version="0.6.6"; sha256="0f0djjv7b77zkfjdlh2afvhqs215lnd3nqc2rwl25jajyjhw6m0j"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; };
+  litteR = derive2 { name="litteR"; version="0.7.0"; sha256="070g65z50dqffa6c5b3n7yp3zmx9hpk7k3vspnpcmsgpd32r0h6n"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; };
   littler = derive2 { name="littler"; version="0.3.9"; sha256="1l0680icgj835hb1b8kanh2zx7cmy3yghglr75qilbvsd4anhxyz"; depends=[]; };
   liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
-  live = derive2 { name="live"; version="1.5.11"; sha256="08xyh6fnwnx7vlz9ldgslkqsnpwb0pdmmc77gl70dwh1c5v3w1gz"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; };
+  live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
@@ -9684,7 +9687,7 @@ in with self; {
   lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
   lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; };
   lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; };
-  lmerTest = derive2 { name="lmerTest"; version="3.1-0"; sha256="1nkz8cmxa5yb8q4i65bmhnn5pd4bhwcyjplyscynb24z3f64xp9b"; depends=[ggplot2 lme4 MASS numDeriv]; };
+  lmerTest = derive2 { name="lmerTest"; version="3.1-1"; sha256="0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj"; depends=[ggplot2 lme4 MASS numDeriv]; };
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmfor = derive2 { name="lmfor"; version="1.4"; sha256="012bk6r6gf6y9skfch2pqr2irv70108sz1x6hakl1bifb4lgnbjp"; depends=[magic nlme spatstat]; };
   lmm = derive2 { name="lmm"; version="1.2"; sha256="1xymcizqfqh2jp0rxgfgniflyqzgcwg04g9mllva5xgc1ydcg69k"; depends=[]; };
@@ -9696,20 +9699,21 @@ in with self; {
   lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; };
   lmom = derive2 { name="lmom"; version="2.8"; sha256="1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna"; depends=[]; };
   lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; };
-  lmomRFA = derive2 { name="lmomRFA"; version="3.2"; sha256="132kdxg82w1zazfvg80jnpsyaj6x0a316hh1v8mg57cw5lxgmgwr"; depends=[lmom]; };
+  lmomRFA = derive2 { name="lmomRFA"; version="3.3"; sha256="113sz2lgb3yv3ayy3x831qww3d088yw2iyjrdc8jfhq6id1w9giq"; depends=[lmom]; };
   lmomco = derive2 { name="lmomco"; version="2.3.2"; sha256="1gqwn5yjd3zcwd5nysayf88vjhj2j1qxfgqcw63q7f2ih0xk1lqp"; depends=[goftest Lmoments MASS]; };
   lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; };
   lmvar = derive2 { name="lmvar"; version="1.5.2"; sha256="0wrny8yzk5y4mzpri6xv5wibbnbaxm0195lcbk5jrl5l5gs99bn6"; depends=[Matrix matrixcalc maxLik]; };
   lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; };
+  lncDIFF = derive2 { name="lncDIFF"; version="1.0.0"; sha256="012dwrcp0pny59hvzj7mnyyc3nijcjgxc0dyx7ab2fknp9bhs5w8"; depends=[]; };
   loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; };
   loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; };
   lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; };
-  locStra = derive2 { name="locStra"; version="1.1"; sha256="0wnis4x85hz5hsi8a9ii2gkbsx8lzp064gab2xdv0k8zizyj0dvk"; depends=[Matrix Rcpp RcppEigen Rdpack]; };
+  locStra = derive2 { name="locStra"; version="1.2"; sha256="1aka3fl8g0v3md1nx50z2zw3bb365lskysdy64n6rlgibmlflwc5"; depends=[Matrix Rcpp RcppEigen Rdpack]; };
   localICE = derive2 { name="localICE"; version="0.1.0"; sha256="0pch4mdn0bj3rlqsai3lqrkv6pw04238n9qvlwzwcwii3wyqhkgs"; depends=[checkmate ggplot2]; };
   localIV = derive2 { name="localIV"; version="0.2.1"; sha256="09z5iqqa9ia4v88fbgf23ww8wxywpyndhzl5mhsp5dvpnj0vyhx1"; depends=[KernSmooth mgcv sampleSelection]; };
-  localModel = derive2 { name="localModel"; version="0.3.11"; sha256="1qy5qpczyp0dbnbfmznzn84cgakvlbsq6cgdn6r08dkdh339d6fb"; depends=[ggplot2 glmnet ingredients partykit]; };
+  localModel = derive2 { name="localModel"; version="0.3.12"; sha256="1yg61zia8gqgzbg33k6q43ni04cj6y9l3k8vdcw8j1qzasnhz0b2"; depends=[ggplot2 glmnet ingredients partykit]; };
   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=[]; };
@@ -9720,7 +9724,7 @@ in with self; {
   loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; };
   lodi = derive2 { name="lodi"; version="0.9.1"; sha256="1207lbin53wlacs6kk8gwzbwllddh4byvs6ai6b9d345k6f9gr56"; depends=[rlang]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
-  log4r = derive2 { name="log4r"; version="0.3.1"; sha256="081fsfgs1shn2002hbvx974421s1294b2l9878q591a4gmv61n1n"; depends=[]; };
+  log4r = derive2 { name="log4r"; version="0.3.2"; sha256="18r5g0817wfn0kmqwv6vf7r2vavi0xh6mqmxrh59y9w3c84npfhl"; depends=[]; };
   logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; };
   logNormReg = derive2 { name="logNormReg"; version="0.3-0"; sha256="172d0y9rb7j0d3m7d22ycfip6s8hk8hlp9810d7r95ra5dr5dx8z"; depends=[]; };
   logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; };
@@ -9757,7 +9761,7 @@ in with self; {
   longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; };
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
-  loo = derive2 { name="loo"; version="2.1.0"; sha256="0zg8a11qhifg1p3hisxin1q47wlykjig4k3dz5zmflfihpps3x0v"; depends=[checkmate matrixStats]; };
+  loo = derive2 { name="loo"; version="2.2.0"; sha256="1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6"; depends=[checkmate matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loon = derive2 { name="loon"; version="1.2.3"; sha256="0h6vbsdp7m9wawjswzzpx7sq8q06xj9l1ln11vfwsyfnp4c66bfs"; depends=[gridExtra]; };
   loon_data = derive2 { name="loon.data"; version="0.0.6"; sha256="01bd3w5xfr7lnbdhi9al5svlg7x3xs4l0jbqsrlamzc96izkm952"; depends=[]; };
@@ -9767,11 +9771,11 @@ in with self; {
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
   lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
   lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; };
-  lori = derive2 { name="lori"; version="2.1.3"; sha256="09wk6pfrfazh8s4zc7v1x5gsra9klh7whc3jnpasvhgnna5515ys"; depends=[data_table FactoMineR rARPACK svd]; };
+  lori = derive2 { name="lori"; version="2.2.0"; sha256="1jsnfrkn6zn20gs8qhw5znfzaqp9j274yfqajcgfvy916j50acac"; depends=[data_table rARPACK svd]; };
   lotri = derive2 { name="lotri"; version="0.1.1"; sha256="1zqp56hxqyf9a820p2d272ykqnrym2qc5sbmah68qv8ql9n1z9qg"; depends=[Matrix]; };
   lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
   lpSolve = derive2 { name="lpSolve"; version="5.6.13.3"; sha256="1xazby8amb47vw5n12k13awv7x3bjci3q8vdd3vk1ms0ii16ahg6"; depends=[]; };
-  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.4"; sha256="13z8ij045zsbn1ip7f2924ppj41bbf8kzpdsbm2h5gkplnw1yqvk"; depends=[]; };
+  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.6"; sha256="04ah9xjr3574i3sfif90f6mln1cxpq7ia2nza30j5pfijqr7vwgd"; depends=[]; };
   lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
   lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; };
   lpdensity = derive2 { name="lpdensity"; version="1.0"; sha256="1rmddq8drvwdlqw9ggf3h8dcvx64hh6ha2v9zdxfjmi50zlcirg5"; depends=[ggplot2]; };
@@ -9781,13 +9785,13 @@ in with self; {
   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=[]; };
-  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]; };
+  lqmm = derive2 { name="lqmm"; version="1.5.5"; sha256="15kyfpbvdgyxl6gjqinx79zq03axg36qgaqfc6zq4blyjlhj6i3c"; depends=[nlme SparseGrid]; };
+  lqr = derive2 { name="lqr"; version="2.0"; sha256="0d1v9k3564cjk4s9l390b41621h7lwgsp84b1x79abxsp1d8vs3v"; depends=[numDeriv spatstat]; };
   lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; };
   lrgs = derive2 { name="lrgs"; version="0.5.3"; sha256="0aqz07vg3z52lq224mapwgwr9mspa7aswzdfngg6x933aqsha4gj"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
-  lsasim = derive2 { name="lsasim"; version="2.0.0"; sha256="1dy9rvjn88rldqsi8vyl5vf544n65xwmqxd7cwpyk7j8sa845wxk"; depends=[mvtnorm]; };
+  lsasim = derive2 { name="lsasim"; version="2.0.1"; sha256="0nbffcgn8wkz07qs8ai3xwx11wfq6qcf95hjqmy4kdkf2k603mm5"; depends=[mvtnorm]; };
   lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; 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=[]; };
@@ -9795,7 +9799,7 @@ in with self; {
   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.9"; sha256="0jfy6j5z53daarv8d8vqsgqdiy6s720m7qlcvrhicc8drvj88mrm"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
-  lsm = derive2 { name="lsm"; version="0.1.8"; sha256="0h7gyc4wb0y3hvs21h22l57czdd3xfycg400ncz5c9s63r47wzx3"; depends=[]; };
+  lsm = derive2 { name="lsm"; version="0.1.9"; sha256="1cyqbsd12m5m8f1vx8lyv21jdcs308fkp4zqlz2482m5fiinlaj2"; depends=[]; };
   lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; };
   lspartition = derive2 { name="lspartition"; version="0.4"; sha256="1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
@@ -9810,15 +9814,15 @@ in with self; {
   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.7"; sha256="1swv5xk5mqmi20wn85a5978gdblmwbx22y3hzadivrk7q130r9w6"; depends=[fields gstat sp]; };
+  ltsk = derive2 { name="ltsk"; version="1.0.8"; sha256="1ykgz5cas924kmq9ak2j8vhr7gg9s458qarqkmyg9wdfj1srqi7p"; depends=[fields gstat sp]; };
   ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; };
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
   lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; };
   lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; };
-  ludic = derive2 { name="ludic"; version="0.1.7"; sha256="17cnd25pnllczccjcsslrldbzg3shcjjxcck5dx0f3pqkkxzjkih"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
+  ludic = derive2 { name="ludic"; version="0.1.8"; sha256="1yvv3h7arm8hp89j9nr5vdl8ahxcpggi2qq431l7xbw9jka41qdp"; 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.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; };
-  lumberjack = derive2 { name="lumberjack"; version="1.0.3"; sha256="164yajzl7c2bg5vmf32kyr49a2g5pd0ng64nqy1qrypg7dppff21"; depends=[R6]; };
+  lumberjack = derive2 { name="lumberjack"; version="1.1.3"; sha256="086xm1br03pwyv6qjmv4fjq5pm9p287zglpxrirr4s4giv3q45am"; depends=[R6]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
@@ -9842,13 +9846,12 @@ in with self; {
   mHMMbayes = derive2 { name="mHMMbayes"; version="0.1.1"; sha256="0dwywrnzdzkq48x2li9waj1yrm9r5b3qnksad42kf1bm28r1mdl5"; depends=[MCMCpack mvtnorm Rdpack]; };
   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.9"; sha256="1zk09w9s8sc11j5cl0v93i09yn83f11diqib27rrph37aix2vs3p"; depends=[igraph survival]; };
+  mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; };
   mRpostman = derive2 { name="mRpostman"; version="0.3.0"; sha256="18ky3xpgb4rns65574jr9fy8jwi6nrz6py9ai8nqf2r1s0bdmww3"; depends=[assertthat base64enc curl magrittr stringr]; };
   mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; };
   mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; };
-  maGUI = derive2 { name="maGUI"; version="2.3"; sha256="0dr0f90ldisqxklhysipbca6di7j6ks6an5k44g65h57b85z4n3q"; depends=[affy amap annotate beadarray Biobase BiocManager 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]; };
-  maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; };
-  mable = derive2 { name="mable"; version="1.0"; sha256="1ny8nfnyqj9c1n4b0m34kadpmnb4k2d81nd66cqxnz8dm9129vqj"; depends=[]; };
+  maSAE = derive2 { name="maSAE"; version="1.0.0"; sha256="0z349p4bipqrfn60cf14b19d1d1b30a302mxkyaknf32n0rz18lk"; depends=[]; };
+  mable = derive2 { name="mable"; version="2.0"; sha256="1z5ffm85x74hn6z4gz51mcg119122f5al4rg0dnc3w2xx03xpg3j"; depends=[aftgee icenReg survival]; };
   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]; };
@@ -9856,14 +9859,14 @@ in with self; {
   macleish = derive2 { name="macleish"; version="0.3.4"; sha256="18pxb1ayqiw8irh05hib6gi5fqyxxgx93jrdd69wwcd455lmn7dv"; depends=[dplyr etl lubridate readr sf]; };
   mada = derive2 { name="mada"; version="0.5.9"; sha256="1l07dbgm9ghvqq9gh7g6yjfvxk0iq8xfyxz03j4nklbs10k3a0pz"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
-  maditr = derive2 { name="maditr"; version="0.6.2"; sha256="0g739j2rg3g69xnkfik94gapnwaj9v0dk1fiw3f8m2hvxyr2wf3k"; depends=[data_table magrittr]; };
+  maditr = derive2 { name="maditr"; version="0.6.3"; sha256="12ycnn384k0hsxlwk2pc3qhaz6rk71sr5qg6harpv3y6w84df8n1"; depends=[data_table magrittr]; };
   madness = derive2 { name="madness"; version="0.2.6"; sha256="1nk6kzjv0fgzbsp3crldq12id2k2wzm4bk9h9bnlkyrjf1hmfiaf"; depends=[expm Matrix matrixcalc]; };
   madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; };
-  madrat = derive2 { name="madrat"; version="1.61.0"; sha256="0i2valganq7fbk0lpgi4szxbrddwpgcq6dj2q9d6pgs8222xcly9"; depends=[assertthat digest magclass nnls reshape2 rlang spam stringr]; };
+  madrat = derive2 { name="madrat"; version="1.64.5"; sha256="1gccfpzbm5cq9q288k86mq0madh8x9nhw06hrrcfjj5waqhi30lj"; depends=[assertthat digest magclass rlang 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.107.0"; sha256="0yl2w9dim462dv9nxsqvdv0ydq6njkk9bywmjanzbqqxnxb9fall"; depends=[abind maptools reshape2 sp]; };
+  magclass = derive2 { name="magclass"; version="5.7.0"; sha256="0r4zkx90djh5nnv56icd2na0zsr7daig28gxkldcpj2c6l2n6526"; depends=[abind maptools reshape2 sp]; };
   magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; };
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; };
@@ -9876,7 +9879,6 @@ in with self; {
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
   majesticR = derive2 { name="majesticR"; version="0.1.1"; sha256="0x23p4js9cfnj8c33cp0fql5pvs4fn4frbbzpq85mxjhiifkxxpf"; depends=[jsonlite urltools]; };
   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.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
@@ -9892,7 +9894,7 @@ in with self; {
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
   manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.0"; sha256="1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; };
   manymodelr = derive2 { name="manymodelr"; version="0.2.2"; sha256="02jswli6k4m9662zf48maix28lr7w93rgwvzgm0nv1zf2mdrh6qb"; depends=[caret dplyr e1071 magrittr Metrics plyr purrr reshape2 tibble]; };
-  maotai = derive2 { name="maotai"; version="0.1.1"; sha256="0g79mhm2cnr8pqhkh6xhi3dxws98i7pbcrw5ciixrghfjn5w7f16"; depends=[Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; };
+  maotai = derive2 { name="maotai"; version="0.1.2"; sha256="0j95q2b9719ffw4nbm0ziyprkj3p8s958xyqyrx202d1r9i0igs6"; depends=[Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; };
   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]; };
   mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; };
@@ -9901,7 +9903,7 @@ in with self; {
   mapedit = derive2 { name="mapedit"; version="0.5.0"; sha256="16rdksnkx6s7w92as896scfdnl1smp00fdnxmlz4ayym2a26wagb"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras leafpm mapview miniUI sf shiny]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapi = derive2 { name="mapi"; version="1.0.1"; sha256="0qfwxrd0ya5amw7f96pfxf3f8m97s7vhaz62clqn083mw8ddaz2l"; depends=[data_table pbapply Rcpp sf]; };
-  mapmisc = derive2 { name="mapmisc"; version="1.7.5"; sha256="0p9vpilyrz7ifhljqsbjvzgql01vl76y45day21n8517gsdwyvkd"; depends=[raster sp]; };
+  mapmisc = derive2 { name="mapmisc"; version="1.7.7"; sha256="07hnfn0fnydckniyhixrsw7m22hmvzksqxlwcw2i0jb7qq3h3vqa"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; };
   mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
@@ -9920,12 +9922,11 @@ in with self; {
   margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marindicators = derive2 { name="marindicators"; version="1.0.0"; sha256="1id055jc624n34vxb68gdy2kgfsm5y61dkfskzhlrwq9d5npxv6m"; depends=[]; };
-  marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
   markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; };
-  marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
+  marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.8.0"; sha256="1s9qdc3jaar1m68a2j368sp7n6c8zbjz7y4c1cj8y54g0fiydqhj"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.8.2"; sha256="1dqkrwk9xmclwzk76lqj9s87jchvfcnmqi9rfjha6lyr5hy7c79g"; 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.3"; sha256="0hjy58kk2kg7v2nq7kfw5rdcrpfhikwr30lz71pfgis34833i7yy"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.1"; sha256="0lcr5bn101krgqwjnbk9r3xizwwxnsgyi84hg95jpb5f2sa2bpg8"; depends=[doParallel foreach]; };
@@ -9933,11 +9934,12 @@ in with self; {
   mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; };
   mastif = derive2 { name="mastif"; version="1.0"; sha256="1xxfql4d298ib9h8821jp717a60vgxq7nzs08yb3xyzp0c3djja2"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; };
   matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; };
-  matahari = derive2 { name="matahari"; version="0.1.1"; sha256="0lsqgxglfvk9p6zyd1m377z3jygvrm2dvrnw0bd6kpadycc8p5cb"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; };
+  matahari = derive2 { name="matahari"; version="0.1.2"; sha256="1bn30c2xf9vw0p4jnw3mjjlr6f5nsib0ffb8736n2v4rrifgxqsg"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; };
   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="1.0-1"; sha256="0c2jaccjdwgnx39jgak35hanaxq301h3qaj90xivlr9dk8xg19qx"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
+  matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
   matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; };
+  matchmaker = derive2 { name="matchmaker"; version="0.1.0"; sha256="162zyvnz80rivy99na1hwp0drq913gvp1gs2jiaficpv4xlxl6ia"; depends=[cli forcats rlang]; };
   matconv = derive2 { name="matconv"; version="0.4.0"; sha256="0kl0647m45mrk13fyr0mkx1x9v3im66ciky8k8nmy4ahkffyasi4"; 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=[]; };
@@ -9952,15 +9954,15 @@ in with self; {
   matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; };
   matrixStats = derive2 { name="matrixStats"; version="0.55.0"; sha256="06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"; depends=[]; };
   matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; };
-  matrixTests = derive2 { name="matrixTests"; version="0.1.7"; sha256="1p0bdy783nj9c94nqwi3vx02rsfsvsjms086mxzhz6icn53l54ch"; depends=[matrixStats]; };
+  matrixTests = derive2 { name="matrixTests"; version="0.1.8"; sha256="18f0nklhq5xsh8dwqqz2kdq5csyxc8jdx3r0d1hcm27l3l48h56s"; 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]; };
   matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; };
-  matsbyname = derive2 { name="matsbyname"; version="0.4.10"; sha256="004947nqy3mps34ym506y8q31awfca7g2y2d4wdq7kncxdk4a388"; depends=[dplyr Hmisc magrittr]; };
-  matsindf = derive2 { name="matsindf"; version="0.3.1"; sha256="18pbc00z8djmbmdzfg3s2n9k48xp8bllab17a93ngwa69cqm1mxg"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; };
+  matsbyname = derive2 { name="matsbyname"; version="0.4.11"; sha256="0v236k0wsj1i92fmh1jikh7qwq7gxsi7dc7kamls611p48wk9082"; depends=[dplyr Hmisc magrittr]; };
+  matsindf = derive2 { name="matsindf"; version="0.3.2"; sha256="1jjfsavhmhjicvccfzh3j1a1ayfhvp81d6fybq660b076ya1hkrr"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; };
   mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; };
   mauricer = derive2 { name="mauricer"; version="2.0.5"; sha256="01x1cigwr95hzyz1pm9w5xi2j9z4zf54p6bwhn0y865gln80wvnz"; depends=[beastier stringr]; };
-  maxLik = derive2 { name="maxLik"; version="1.3-6"; sha256="0jlj8g7pm3caa4r7slwqd9rfrh7sn22g36dgynmcaw3dfwj23scm"; depends=[miscTools sandwich]; };
+  maxLik = derive2 { name="maxLik"; version="1.3-8"; sha256="1rfzd2n7ak69pbnnzbvd0c4kk9h812sq1f17hamnqx77pw84sh1k"; depends=[miscTools sandwich]; };
   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]; };
   maximin = derive2 { name="maximin"; version="1.0-3"; sha256="1wfhpgk149aw6gkdlr8g29icj0l0xa8fczxkz4hbdr91dqmnxvp3"; depends=[plgp]; };
@@ -9975,23 +9977,22 @@ in with self; {
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
   mbend = derive2 { name="mbend"; version="1.2.3"; sha256="0w1rrj1zcbvi8nlspzqa8142ilvbw9q6m26kmxqcp9mvqzbnbd30"; depends=[]; };
   mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; };
-  mbgraphic = derive2 { name="mbgraphic"; version="1.0.1"; sha256="1f5zzm9xv6c4qid75r4pww4cqclk664m5xm5p72yb9ijiwc77cy1"; depends=[diptest dplyr energy GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; };
   mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; };
   mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; };
-  mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
   mboost = derive2 { name="mboost"; version="2.9-1"; sha256="02ia3y0fxfjl02fb1nnl93j640fyl18jm15cgxyybhf27w4jdvb7"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
   mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
+  mbsts = derive2 { name="mbsts"; version="1.0"; sha256="0wkglh1g0kdlgw4afqxvwb26difnqhf6g5jsbf8y39mpipxla365"; depends=[KFAS MASS Matrix MCMCpack pscl]; };
   mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.0"; sha256="1jrj7kkykhw9qj71cfjrn5gbm3qyrbdcc4cj3mfz62wlvny18233"; depends=[metafor]; };
   mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; };
   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]; };
-  mcStats = derive2 { name="mcStats"; version="0.1.0"; sha256="0hwn34w3w4b09a4yl586df8wkwsvbmhpi3lh2kzkna6q0kzc380k"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr tidyr]; };
+  mcStats = derive2 { name="mcStats"; version="0.1.1"; sha256="1jc9mzk97d8fcbn6rh6prgwbdir2hzjfxm0ydw75h6mkgiqchcz0"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; };
   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.6.0"; sha256="0frac86ahljc0pamky1zds32amh3sadd1299x8k7qcfmlv1rh4ym"; depends=[caret e1071 MASS nnet pROC rgl rpart]; };
+  mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; };
   mccf1 = derive2 { name="mccf1"; version="1.1"; sha256="023pvjfc1iv7hac3gz5rakg6ljs92j0qfm4givad5iiwv5n4k3zr"; depends=[ggplot2 ROCR]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; };
@@ -10015,7 +10016,8 @@ in with self; {
   mcmcr = derive2 { name="mcmcr"; version="0.2.0"; sha256="0jiyr0ncwhkgvkq4jb27iv1pxra9jbrjkv57lla71afr6glisqp2"; depends=[abind checkr coda err]; };
   mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
-  mcompanion = derive2 { name="mcompanion"; version="0.4-5"; sha256="18l29cbggf5mdab8vdzmbsnc0p77llaq3ylp07a7gsq44bys8zq0"; depends=[gbutils MASS Matrix Rdpack]; };
+  mcompanion = derive2 { name="mcompanion"; version="0.5-1"; sha256="11drfgy0knixhwjsywcr95b0isfmqkx9ygxq4phdnz839m2bki30"; depends=[gbutils MASS Matrix Rdpack]; };
+  mcp = derive2 { name="mcp"; version="0.2.0"; sha256="19bckg1wzv6k2j57s38rpjqrimj34lzaa3f0izxz36sahavyy2vj"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork purrr rjags rlang stringr tibble tidybayes tidyr tidyselect]; };
   mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; };
   mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; };
   mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
@@ -10053,6 +10055,7 @@ in with self; {
   mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot 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=[]; };
+  meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; };
   meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; };
   medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; };
   meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; };
@@ -10067,7 +10070,7 @@ in with self; {
   meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; };
-  memisc = derive2 { name="memisc"; version="0.99.20.1"; sha256="1x0vm115m02zwq45knlkrwis21swkwcwl19fhqa59vmncrmzjsqy"; depends=[lattice MASS repr]; };
+  memisc = derive2 { name="memisc"; version="0.99.21"; sha256="0fbljiz6ifyfjkqk4nsxmnqafdklqsbzihnbdg4cwbr25dx83hyq"; depends=[data_table lattice MASS repr]; };
   memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
   memochange = derive2 { name="memochange"; version="1.1.0"; sha256="1im6342by0pf1kmz8jps9d3y752k87bl02v5ddywbvh0idkdnba5"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; };
@@ -10075,18 +10078,17 @@ in with self; {
   memor = derive2 { name="memor"; version="0.2"; sha256="10w2jw9ma7yds2d179l7bv4rzpggp3l04kvqnncii6yf5f4lj9cd"; depends=[knitr rmarkdown yaml]; };
   memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; };
   memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; };
-  mephas = derive2 { name="mephas"; version="1.0.0"; sha256="0338kr7hjbdrz2239lpyn3rplsg216hxvj532v80zrva0skrbzzf"; depends=[DescTools ggfortify ggplot2 gridExtra pastecs plotROC pls psych reshape Rmisc ROCR shiny spls stargazer survival survminer xtable]; };
   merDeriv = derive2 { name="merDeriv"; version="0.1-7"; sha256="0zvsbpz8v8bw458rvafw4cm8dwxbnvakm01ry3bxvq34hzg8ffg6"; depends=[lavaan lme4 Matrix nonnest2 sandwich]; };
   merTools = derive2 { name="merTools"; version="0.5.0"; sha256="19qf3nn57hvd80x2l0m34w2jaky0jgsgc4nh0vdqjl8kpx4044cr"; depends=[abind arm blme broom dplyr foreach ggplot2 lme4 mvtnorm shiny]; };
   mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; };
   mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; };
-  merlin = derive2 { name="merlin"; version="0.0.1"; sha256="14k8kz8icj3wgd3li83v0wfl61pdc97r7qjcsmmc5srp36kbw1i9"; depends=[MASS randtoolbox statmod survival]; };
+  merlin = derive2 { name="merlin"; version="0.0.2"; sha256="0r1hxbpqhih0nyya26hphymz4jrw88zfd3bypf1hwj5dsk60341f"; depends=[MASS randtoolbox statmod survival]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; };
   metR = derive2 { name="metR"; version="0.5.0"; sha256="0dpbzyawswlvzydx54i4f75zv79qww1p5hk1p4pzjc7fmgx9ba57"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr purrr RCurl scales sp stringr]; };
   metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; };
-  meta = derive2 { name="meta"; version="4.9-7"; sha256="0fwas40007sm6x6zf7vv8527qj7kq6h6amqsyl68nilvwfg4d0ap"; depends=[lme4 metafor]; };
+  meta = derive2 { name="meta"; version="4.9-9"; sha256="1z475n7g6rawz07p6myqgg6cgz4rbsfgmn6phbfpz4hf7wx84g9q"; depends=[CompQuadForm lme4 metafor]; };
   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.6.2"; sha256="0g2npgr9rqf0f9xqdp4wl3263shrp28j4i63j4fwd91xk9qmy8my"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
@@ -10097,9 +10099,10 @@ in with self; {
   metaRMST = derive2 { name="metaRMST"; version="1.0.0"; sha256="1mq9j7iczjh7d3cps9g1bh0f8k388bdn8d5lkjs2s8y9fq1kxzmx"; depends=[meta mvmeta rstpm2 survival survRM2]; };
   metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
   metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.0"; sha256="08q2llzqakrrxab73a63s4bpqq461m4q1dl60za9826yxl3g86b8"; depends=[Matrix maxLik ordinal truncnorm]; };
-  metaSEM = derive2 { name="metaSEM"; version="1.2.3"; sha256="13bny83pnd0mwz6bcnvpnn9bipvzj7ifwsx1z145gs5arx7k7dsh"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
-  metaboGSE = derive2 { name="metaboGSE"; version="1.2.1"; sha256="169m59y2g3618rpjjlmwsj1alkfcjfhpsyzhz9010vn38bbwgmxr"; depends=[AnnotationDbi ape Matrix sybil sys topGO]; };
-  metacart = derive2 { name="metacart"; version="2.0-1"; sha256="1dv4vq3pxbmjg8xxjjxxqnl3njy4v7j20ha90sj1i2dd814y0r72"; depends=[ggplot2 gridExtra Rcpp rpart]; };
+  metaSEM = derive2 { name="metaSEM"; version="1.2.3.1"; sha256="09icvg60fkgxq28cfnkz93kyj5kza0vg9wifhsis71a35x7k0x72"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
+  metaboGSE = derive2 { name="metaboGSE"; version="1.2.3"; sha256="0v74h5pdfg8d8chrqk0z773w8hhy5szlxm9mzz00fdrmz0wx8838"; depends=[AnnotationDbi ape GO_db Matrix sybil]; };
+  metabolighteR = derive2 { name="metabolighteR"; version="0.1.0"; sha256="1kbwxwcx5f836bhwx32a41c6753832wigx0b6gi9zblc4qsnqvlq"; depends=[dplyr httr magrittr purrr]; };
+  metacart = derive2 { name="metacart"; version="2.0-2"; sha256="1rn246avzisbrw9parap7hpgxb7pj5y43zfvayaiz4ilhdl5vj4y"; depends=[ggplot2 gridExtra Rcpp rpart]; };
   metacoder = derive2 { name="metacoder"; version="0.3.3"; sha256="0d7fpx5zpggc8k3y882mlw4szn7ghzckyiaxj9x652xink8zi397"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; };
   metacom = derive2 { name="metacom"; version="1.5.2"; sha256="0v2rscql8vks12v5s9rvfrylh175if2mnpr69wsvr2snlcjxmirq"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2.1"; sha256="0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0"; depends=[gsl rmeta]; };
@@ -10107,7 +10110,7 @@ in with self; {
   metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="2.1-0"; sha256="009x5w163g4pbak23i5xw3ipk5s9xljkdj9py5vir3vpxxazk267"; depends=[Matrix nlme]; };
-  metaforest = derive2 { name="metaforest"; version="0.1.2"; sha256="0ppv9vdwxggccn2202snl13vid3v2kx5ps81cadghg2kcd8axfbs"; depends=[ggplot2 gtable metafor mmpf ranger]; };
+  metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; };
   metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; };
   metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; };
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
@@ -10117,8 +10120,9 @@ in with self; {
   metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; };
   metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; };
   metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; };
+  metan = derive2 { name="metan"; version="1.2.1"; sha256="0bgyrza03fdjd8hannzc70hrmd2cn6cvs58kq4lmjds5vckk27w5"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel gplots lattice lme4 lmerTest magrittr progress rlang tibble tidyr tidyselect]; };
   metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; };
-  metap = derive2 { name="metap"; version="1.1"; sha256="10kv7z8pik5iy374h399vws0ldf41y2nczlwh8axqf9dcwl084i0"; depends=[lattice Rdpack]; };
+  metap = derive2 { name="metap"; version="1.2"; sha256="0pfbcixjrzx81l9wqhlp55khg9k63zf8pvg2n39c19akr4ppzhvf"; depends=[lattice mutoss Rdpack TFisher]; };
   metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; 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]; };
@@ -10128,24 +10132,25 @@ in with self; {
   metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; };
-  metawho = derive2 { name="metawho"; version="0.1.0"; sha256="0g294rd5wl0h20wy2b5hgdfig6k2b8lwvrswiavzmawjpvbl9pd5"; depends=[dplyr magrittr metafor purrr]; };
+  metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
   meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
   meteoland = derive2 { name="meteoland"; version="0.8.3"; sha256="0xbnb5kpb565ivi1qx2jmbgx5zg3bv65q4a7aylhdxijsjdr8vcv"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; };
   meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; };
-  meteorits = derive2 { name="meteorits"; version="0.1.0"; sha256="0b2rpq03wijmnqbdbdm10nzh19zvqhfcwnnph2f94ibsip6fxzy8"; depends=[MASS pracma Rcpp RcppArmadillo]; };
-  metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
+  meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; };
+  methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; };
+  metricTester = derive2 { name="metricTester"; version="1.3.6"; sha256="0m49sl42bf0rlkvg3sq87vgx3dv65pxvcm07gflx5wlr26x1r0s1"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR vegan]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
   mets = derive2 { name="mets"; version="1.2.6"; sha256="0vaqizmr27144dkh5mh095vih0p70j3ly9zwk5h0fklmn8bf2qhl"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; };
   metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; };
-  mev = derive2 { name="mev"; version="1.12"; sha256="1vq2l6znwagxs6h216lzf8x14656x192ylwvc5gr3b0y7ry0rqdf"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; };
+  mev = derive2 { name="mev"; version="1.13"; sha256="0mcjis66v9jzcdamagizvz5c58qpzqa9dzj0ypqfv1cl061d6c4j"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
-  mexhaz = derive2 { name="mexhaz"; version="1.6"; sha256="18gaji566hwfmpfznhlcvvk6f667vhadap3qcklpgddjaca2yc0v"; depends=[MASS numDeriv statmod survival]; };
-  mfGARCH = derive2 { name="mfGARCH"; version="0.1.8"; sha256="1pzzn4s98fsyqkrldnpqgxg7ia60dikq73bbfn6xgc63gr6l78r2"; depends=[maxLik numDeriv Rcpp zoo]; };
-  mfbvar = derive2 { name="mfbvar"; version="0.5.1"; sha256="1s6qmjsj6d5yds06m3fjqqvvfa19ara4rv8b04r8ax8wjci66ix9"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; };
-  mfe = derive2 { name="mfe"; version="0.1.3"; sha256="1y0l81z2ds3fv3j9jbqgv0s0hwizy246a3iwfp60phqy47rbd8jj"; depends=[cluster clusterCrit e1071 infotheo MASS rpart rrcov]; };
+  mexhaz = derive2 { name="mexhaz"; version="1.7"; sha256="1z0516i7asyn3248xzvvc377slcy2zv6f9qalkd33r3dlc0js4s8"; depends=[lamW MASS numDeriv statmod survival]; };
+  mfGARCH = derive2 { name="mfGARCH"; version="0.1.9"; sha256="0vmxyjg2jj39dd1307d5jwz3033j8ldfqhysmmzl3i1b5ypfd5q5"; depends=[maxLik numDeriv Rcpp zoo]; };
+  mfbvar = derive2 { name="mfbvar"; version="0.5.2"; sha256="02gvh3qvqb08j684y3ylwz1rddi11884xs8nr7b93p5nypgfr9bp"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; };
+  mfe = derive2 { name="mfe"; version="0.1.4"; sha256="1lif39zr6x1ysv8s90b1wgshp5pa175fxcjvx0hz6g15d29gwgy6"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; };
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
@@ -10166,17 +10171,18 @@ in with self; {
   miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; };
   miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
   miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
-  miWQS = derive2 { name="miWQS"; version="0.1.0"; sha256="03617f85zz09rlh6a8fsqry186d578w6vd1aybdjbpj3zi5y798j"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS rlist Rsolnp survival tidyr truncnorm]; };
+  miWQS = derive2 { name="miWQS"; version="0.2.0"; sha256="1api75d3jr4hh8b049jllnfb3kxlllziwbvvgxjhcbcr5kv2k4j8"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS matrixNormal purrr rlist Rsolnp survival tidyr truncnorm]; };
   micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; };
   micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; };
   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]; };
   micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; };
-  mice = derive2 { name="mice"; version="3.6.0"; sha256="0pgcxdmp77604h6f4x8hhs6j4xdjgf5b9zvnixyzdj8vcgdjpivv"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
+  mice = derive2 { name="mice"; version="3.7.0"; sha256="1wx1s1gc07iz63w4m8z0i1n5mc273f89grp5d3hfla7ypicjkasf"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
   miceFast = derive2 { name="miceFast"; version="0.5.1"; sha256="0n09l6y7jwcskv2lfynyzl614c7x84yyc52wqwyhnzvd8lzapp5d"; depends=[data_table Rcpp RcppArmadillo]; };
   miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
-  miceadds = derive2 { name="miceadds"; version="3.6-21"; sha256="1gk91rg1p1s042cnlkcm6lnszfrknpbysc8gkhinyxyw7bm87h62"; depends=[mice mitools Rcpp RcppArmadillo]; };
+  miceRanger = derive2 { name="miceRanger"; version="1.2.0"; sha256="1bjg7qmywls76cqcyz5pwg00cryk4hf495jbk5a6j3rq9ihdagkm"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; };
+  miceadds = derive2 { name="miceadds"; version="3.7-6"; sha256="1jpddrw7vrm4v7n01qg7kigaicljnnrhqfjwnm9hl13mc2r928cg"; depends=[mice mitools Rcpp RcppArmadillo]; };
   micemd = derive2 { name="micemd"; version="1.6.0"; sha256="1n8kzdf2713dw9mbzvbwl0gknzi9amdqnabfw2wmb70gsvma3f48"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; };
   micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
@@ -10189,10 +10195,10 @@ in with self; {
   microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; };
   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]; };
+  micropan = derive2 { name="micropan"; version="2.0"; sha256="0hn5k1mj60bn2hm1c87206q9hr5qqswbihdzkc27w3bpxwglgvl7"; depends=[dplyr igraph microseq rlang stringr tibble]; };
   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.6"; sha256="093rldfx3b45j4qn0r42d7fmqzx4h43s6vq4zlysdimq4ncxdm3v"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; };
-  microseq = derive2 { name="microseq"; version="1.3"; sha256="1svkgx2ymxzn0zm1gzwcjhdyml2zjy4m0p7wg5phmnxpkz5m9win"; depends=[Rcpp stringr tibble]; };
+  microseq = derive2 { name="microseq"; version="2.0"; sha256="1i4xw7v5c3fzkz4gbcdp35idj1sm47gc4fmjwjsk9czi8nh591wr"; depends=[dplyr Rcpp rlang stringr tibble]; };
   microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; };
   midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; };
   midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; };
@@ -10203,11 +10209,10 @@ 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.7"; sha256="12vpip67ajb90b8p96w43ir7mavrw2i61bwvpfnrlmlj9kj3w20i"; depends=[]; };
+  mime = derive2 { name="mime"; version="0.8"; sha256="18w98prfbivvygiyamsf9yg090kzbnvw2fn9b27823gmis4d08ny"; depends=[]; };
   mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; };
   mimsy = derive2 { name="mimsy"; version="0.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; };
   minMSE = derive2 { name="minMSE"; version="0.1.1"; sha256="11m34nmxi2v80lsix8k44vl8ms5541js4av6h3pvx11px3i3c841"; depends=[MASS]; };
-  mindr = derive2 { name="mindr"; version="1.2.2"; sha256="1ggpdjyjaprw03gjqk34h7k4h3cdxrwmwvjg5sdqdp0pya6ik03y"; depends=[data_tree htmlwidgets jsonlite knitr]; };
   mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; };
   mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; };
   minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; };
@@ -10221,20 +10226,20 @@ in with self; {
   minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
   minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; };
   minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
-  minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
+  minque = derive2 { name="minque"; version="2.0.0"; sha256="0pczdg22i3if048i64chzcpnv3ay8p0anmhwjmzm29577z0jgms8"; depends=[]; };
   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.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; };
   mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; };
   mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
-  mirtjml = derive2 { name="mirtjml"; version="1.2"; sha256="0vjcbgl1s8haqc0xi4k8dsqvhr2qyz4ikhjwmqrxyl5xssjy330r"; depends=[GPArotation Rcpp RcppArmadillo]; };
-  misaem = derive2 { name="misaem"; version="0.9.1"; sha256="1790igbb4nlp9d9h17gzp3backazpf8bi66n1ik3h58qwv4610hj"; depends=[MASS mvtnorm]; };
+  mirtjml = derive2 { name="mirtjml"; version="1.3.0"; sha256="12m2qhxgjc4qappw4w159326kgbz069xiqqc44qgzw3xhpl5lm5q"; depends=[GPArotation Rcpp RcppArmadillo]; };
+  misaem = derive2 { name="misaem"; version="0.9.2"; sha256="0awn0dvriycgmrx31ibckwjm2cq1wxrqjjjaq0bjgjsl37f4xnkk"; depends=[MASS mvtnorm]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
   miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; };
-  miscTools = derive2 { name="miscTools"; version="0.6-24"; sha256="0sqixfawnf2kb1172a3dcihk85gxwzqmkllkdgg0mik8zch635s9"; depends=[digest]; };
+  miscTools = derive2 { name="miscTools"; version="0.6-26"; sha256="16pwfxpyl0zv3hjxx2kjchkg7p6kbj0s2rrpskj7rkhjr9imlg5y"; depends=[digest]; };
   misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; };
   miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; };
   miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; };
@@ -10244,10 +10249,10 @@ in with self; {
   missCompare = derive2 { name="missCompare"; version="1.0.1"; sha256="0f173463dsr2xcj228aysfnabrdv8i2c9sprmd2jndn65dv8hhsz"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; };
   missDeaths = derive2 { name="missDeaths"; version="2.5.1"; sha256="1vj1d4r2ikc7ppm5kgivc7bj81qkyymrs11cxj1gdll6xyfn1g1d"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-  missMDA = derive2 { name="missMDA"; version="1.15"; sha256="0c4zinknrpixbd3czl1lnvwc7jswi8ci03dwajl90qxgh78g3v92"; depends=[doParallel FactoMineR foreach mice mvtnorm]; };
+  missMDA = derive2 { name="missMDA"; version="1.16"; sha256="0c5a9ygvvx2qi9hgbwnhl4hcljy2b4hi2x3py2qyay9bp0zvchxm"; depends=[doParallel FactoMineR foreach mice mvtnorm]; };
   missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; };
   missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; };
-  missingHE = derive2 { name="missingHE"; version="1.2.1"; sha256="1ckkszq9c095svg3syfnrcdxy64yfm14rskglpsiyl1d4im9h9c8"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; };
+  missingHE = derive2 { name="missingHE"; version="1.3.2"; sha256="0i4af7479nnrbljbianwq4r6f0gs80y29mq9chykjyrbh0fpj15n"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
   mistr = derive2 { name="mistr"; version="0.0.2"; sha256="12zh6ys3lfc5ylidjhbmbxvbhjd3rg9vd89pv94547z9y1yf6sx5"; depends=[bbmle]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
@@ -10262,6 +10267,7 @@ in with self; {
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixRaschTools = derive2 { name="mixRaschTools"; version="1.1.1"; sha256="1giq6d97sg6f66sh0gw6x1f2ax4ys91kfnrlpdv37m7qakk5npyj"; depends=[]; };
   mixSPE = derive2 { name="mixSPE"; version="0.1.1"; sha256="103lr74wryrk7sakss9cn774fjwy5xqc4hrcr7ig6m0dzyx4gqzl"; depends=[mvtnorm]; };
+  mixcat = derive2 { name="mixcat"; version="1.0-4"; sha256="19v6y981js18xz9q49slclkhcf6w53iar55ynjs0lvhn1y1b2517"; depends=[statmod]; };
   mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; };
   mixdir = derive2 { name="mixdir"; version="0.3.0"; sha256="1vgxxzsrl660agk4cjw4q4gx28fv5mkzpjy4qanq5c9mqpcxbxkc"; depends=[extraDistr Rcpp]; };
   mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; };
@@ -10272,21 +10278,20 @@ in with self; {
   mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; };
   mixl = derive2 { name="mixl"; version="1.1"; sha256="0v3yxhar1ms6y2j73a5hgyh1c9v6lg5xl646mv0ischqj21bysbh"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; };
   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]; };
-  mixmeta = derive2 { name="mixmeta"; version="1.0.5"; sha256="0wyzvsw76wb95fvvy43q9n9gkgc32ys8qdhm36gs56dg85bjzsgd"; depends=[]; };
+  mixlm = derive2 { name="mixlm"; version="1.2.4"; sha256="0jwz918qnz1p71y82ayrgir9rpij8zk3jgmn63nq5xrlf0jbjcdd"; depends=[car leaps multcomp pls pracma]; };
+  mixmeta = derive2 { name="mixmeta"; version="1.0.7"; sha256="0y0q38w9ljadh64kmmfn8chsmmrhpik54rh64iiq45b8ihxb1sq8"; depends=[]; };
   mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; };
   mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
   mixsmsn = derive2 { name="mixsmsn"; version="1.1-6"; sha256="0zlbs0yn336xdzymrb065rbg1zj8f7zri77lmd7c4w1rxhfjh9a9"; depends=[mvtnorm]; };
-  mixsqp = derive2 { name="mixsqp"; version="0.2-2"; sha256="12gm40dlh007dqxhaba0d6ssmrarhy5qlslmgymr3sil72rgz9a4"; depends=[Rcpp RcppArmadillo]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
   mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; };
-  mize = derive2 { name="mize"; version="0.2.2"; sha256="1p728svnj5ckixry6xw70nywqabmgdcygdsa6dvpicr2s4sffn86"; depends=[]; };
+  mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; };
   mizer = derive2 { name="mizer"; version="1.0.1"; sha256="1vn03f3j9vd8hwz18i67blif33y3cd7hc8m1h4aw7wkgdpqsyb4b"; 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.49.7"; sha256="11zr15isjf26k5rzbraxxs7i1k4c6zc11va1w5wgvkhbxsa93j4r"; depends=[deSolve inline lmtest numDeriv R6]; };
+  mkin = derive2 { name="mkin"; version="0.9.49.8"; sha256="01sjahhwz80aixxjksfb2bnilryggzs57cmhw6r6crq2sarzcqin"; depends=[deSolve inline lmtest numDeriv R6]; };
   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]; };
@@ -10296,61 +10301,63 @@ in with self; {
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
   mlbgameday = derive2 { name="mlbgameday"; version="0.2.0"; sha256="05b8jdrcfrh6rli9inkgizkmmj9jw0cypc5r4ckqqbrfj00zfi3q"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; };
   mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; };
-  mldr = derive2 { name="mldr"; version="0.4.2"; sha256="07d5zcid7bh8axkzi2x6mwj5zny5xfydzjdygjl3b0mz2qqrak1n"; depends=[circlize shiny XML]; };
+  mldr = derive2 { name="mldr"; version="0.4.3"; sha256="07lbxpydz78fya11bl3l1ckhbps3nx43ddh3z09ygg70jjbdhxwq"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.2"; sha256="0zyfv8xy5yik0k3j0kf9r43xrvj528qzdb1v74sfi24vim6k6503"; depends=[]; };
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
-  mleap = derive2 { name="mleap"; version="0.1.3"; sha256="17i6rjbrf14g6857jpkpjwcac028861m1nn073wzf2kmznd2rfkk"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
+  mleap = derive2 { name="mleap"; version="1.0.0"; sha256="1abdab96wgybfgfbcai657hrbkn3kprxqw3ww415vpg2xhi8p905"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
-  mlergm = derive2 { name="mlergm"; version="0.4"; sha256="0mv5wmcs28n0sq8z46mc4v2j1cqf8x1s5ji3phkvizasyfg9wi78"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; };
+  mlergm = derive2 { name="mlergm"; version="0.5"; sha256="145004r8xihphsng8pna430a8rqg0ibqx92jwyjkn7hzpx17p7xf"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
-  mlflow = derive2 { name="mlflow"; version="1.4.0"; sha256="0kn9phlr817mjn1sj2x31ia2r3xfvr4cfhk96rp8c4vx2b2chppw"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
+  mlflow = derive2 { name="mlflow"; version="1.5.0"; sha256="1aks7azc3s51f40jhqgkr5hl43h18w5njzms7q6vchbdhb8cydrq"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; };
   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-7"; sha256="0gj7yk2gll6y99q4h6ggds37fcww8d326h44rygcl155y0482rky"; 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]; };
   mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; };
   mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
-  mlogit = derive2 { name="mlogit"; version="1.0-1"; sha256="1cjh0dl0yvzyz5wsplygm4al2zfvs7cgdg5fhbcjnv159qfvflml"; depends=[Formula lmtest MASS Rdpack statmod zoo]; };
+  mlogit = derive2 { name="mlogit"; version="1.0-2"; sha256="18dnwbs0jlsp8sli6qr4j5gpg8v619hyq0cwkb1ms1kwngpszhsw"; depends=[Formula lmtest MASS Rdpack statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.16.0"; sha256="0sp7hi7x4f23yjyfcmhv4892aci4ancym8zkkff16wdvkhfi9f1x"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
-  mlr3 = derive2 { name="mlr3"; version="0.1.4"; sha256="1rc9xf9pqj9v85slcc07wqi94w6d0x2m78yk5x1x1j06kvrz29y3"; depends=[backports checkmate data_table digest lgr Metrics mlbench mlr3misc paradox R6 uuid]; };
+  mlr = derive2 { name="mlr"; version="2.17.0"; sha256="0x7jggvhg8pf1hw013qrg7zdaf8yq5znjl2ap0f9a6w2j34b32yf"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlr3 = derive2 { name="mlr3"; version="0.1.6"; sha256="096rn1ljkimhfvd487wyp3qb28dm7qhpyj35nghgci7y7cq50jam"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; };
   mlr3db = derive2 { name="mlr3db"; version="0.1.3"; sha256="0zg5hmlc7mybhrz0hrz4rmvdhbvjp4d0im0r22qvsd3phv614v8m"; depends=[checkmate data_table digest dplyr mlr3 R6]; };
-  mlr3filters = derive2 { name="mlr3filters"; version="0.1.0"; sha256="12ss7w68s6dmq6dy8iap2kipc1m8d8di5iywghcqspdbzcx5ynmz"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; };
+  mlr3filters = derive2 { name="mlr3filters"; version="0.1.1"; sha256="0xis7yk3ycchpykl2kp0w1rx806rxnyrrcxnw9m240svzs3367x3"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; };
   mlr3learners = derive2 { name="mlr3learners"; version="0.1.5"; sha256="0yraazjfrd3vpbl9na5c77yy8lcdhisq30d7nl13ha2pssn7ifb3"; depends=[data_table mlr3 mlr3misc paradox R6]; };
   mlr3measures = derive2 { name="mlr3measures"; version="0.1.1"; sha256="0pbsj1yra3wx5xny4ak901qfj983lk8nsiqw2x8kzz46dskx4wzl"; depends=[checkmate]; };
-  mlr3misc = derive2 { name="mlr3misc"; version="0.1.5"; sha256="1ni8a318gc6slscb28vl3a33kr5qfwmjbc66igmi7bn5brk7iik1"; depends=[backports checkmate data_table R6]; };
-  mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.1"; sha256="0sw907w9w6w71jq8pirmwd683blic6pfhsj6b2cf8jjnnx56amhn"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; };
-  mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.0"; sha256="065vwq830hb388r8767dlr1k80rq27zhpmfjnvh9w64jn46wz763"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; };
+  mlr3misc = derive2 { name="mlr3misc"; version="0.1.6"; sha256="1kcxkpm66n71rc2pzy1xpkfm797palfz2axj0shms4xpjilzfzf1"; depends=[backports checkmate data_table R6]; };
+  mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.2"; sha256="14clmipbqinmyrxfa363gjffdzijz1vd2zzbgkkldv44xszgb7p9"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; };
+  mlr3proba = derive2 { name="mlr3proba"; version="0.1.1"; sha256="0cangy4j3haglsc356az9l73k62m8i9b5wdvc5kpb848f63yzafc"; depends=[BBmisc checkmate data_table distr6 mboost mlr3 mlr3misc mlr3pipelines paradox R6 survival]; };
+  mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.1"; sha256="09wmil8v5vn705zhsj0rjag6sh3n1mdsjb79xca8x4a72lv09i45"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; };
+  mlr3verse = derive2 { name="mlr3verse"; version="0.1.1"; sha256="1spwmylnsks479nkj688nd8h3slkh8cnmrxrvh7s2zyqla6arigx"; depends=[mlr3 mlr3db mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; };
+  mlr3viz = derive2 { name="mlr3viz"; version="0.1.0"; sha256="1c28hrpp3majw781jaayjhg9rwr52r0v00dfv78jy6rgaps9r37h"; depends=[checkmate data_table ggplot2 mlr3misc]; };
   mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-4"; sha256="0v8d336f7xghs2pdh6r5j21i6mcy0p2wdzx4nkj69fsc5gn0n058"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.3"; sha256="1y67kc8kcbim23kkymkn10h761r5pyq80cfzz6a7f0rnmagzvqxp"; 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-7"; sha256="004mydn99p34f4nxh49zi3q2q1lw164j7ijbcd9fw7blm7i14dp0"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-3"; sha256="1nminamywhwh3l2w3458iapb0zi1784nvdys3ni9ynxbgnxzgr70"; depends=[mlt numDeriv]; };
+  mlt = derive2 { name="mlt"; version="1.1-1"; sha256="0n2avjmi53y69wf0cz6v1n358n9vaf6shlf3vcppy2c2zny5l8rn"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-4"; sha256="07x3qnfrlb3m71jyd0rqa3svdplcia3zis1qmcwm1c936p7nvjg4"; depends=[mlt numDeriv]; };
   mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; };
   mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="4.1.0"; sha256="1jb214isf0zbx1j7xkidmc4jrvlw3hfvs7q2if3489p0si1n2k23"; depends=[ggplot2]; };
   mma = derive2 { name="mma"; version="9.0-0"; sha256="1nam7gn3a7jp4dcy9q6ypk7icknflvgmsdzv218qhf28zaw2ybza"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; };
   mmabig = derive2 { name="mmabig"; version="2.0-0"; sha256="1kp7q2xvkbwa8syk82dsynzizjmhh9z3p7r5hnnvp169as0yvgwl"; depends=[car glmnet gplots mma survival]; };
   mmand = derive2 { name="mmand"; version="1.5.4"; sha256="04kqxdbj54nflgx9lb80xxp121ligdzjkym850z3kbw60ashxybh"; depends=[Rcpp]; };
-  mmap = derive2 { name="mmap"; version="0.6-17"; sha256="1dh1i2v2pzhag8brc9c0z8vfs858rpbkg1xqqi4fi866w7g4lhxy"; depends=[]; };
+  mmap = derive2 { name="mmap"; version="0.6-19"; sha256="0s3vlwdcwifl2a2byr0f2cc4vmbdparc55x889a3h115ga7k91w2"; depends=[]; };
   mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
   mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; };
   mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
   mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; };
-  mmeln = derive2 { name="mmeln"; version="1.3"; sha256="0hx59pizd6sgryca7g26n2wa5rdi3zd059w7yz66981p6mi4a5dk"; depends=[]; };
+  mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; };
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
   mmetrics = derive2 { name="mmetrics"; version="0.3.0"; sha256="0g2bpsywcly2nz59vjxb3v5jdxq76wvv8iwyv5fqs8n78r208kxd"; depends=[dplyr ggplot2 magrittr purrr rlang stringr]; };
   mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
   mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
-  mmpca = derive2 { name="mmpca"; version="1.0.1"; sha256="0ah9w3sf7fh6simbhgx88q9cr44r79f314r615ss9l29m6ws7ffv"; depends=[CMF digest gmp gsl Rcpp RcppEigen]; };
+  mmpca = derive2 { name="mmpca"; version="1.0.2"; sha256="0km129g98bbzi48akqad97nxss5qkxpsx77hpmam4nsbfj4idn6f"; depends=[CMF digest gsl Rcpp RcppEigen]; };
   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]; };
@@ -10373,7 +10380,7 @@ in with self; {
   mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; };
   mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; };
   mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
-  modEvA = derive2 { name="modEvA"; version="1.3.2"; sha256="0p41fl0k780rx1vmq9laknz01ar6507sj8ss8kphrqkjnymsi2a0"; depends=[]; };
+  modEvA = derive2 { name="modEvA"; version="2.0"; sha256="1vkg7x48k0xl1ngqwk6waggidva924j8mv7wfbzfcyj36yv8ggdw"; depends=[]; };
   modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
   modQR = derive2 { name="modQR"; version="0.1.2"; sha256="0x4405gaxpmmy6a0r8s7sxdi2lnc76f2i174h7xqlrwqy13xyfvv"; depends=[geometry lpSolve]; };
   modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
@@ -10382,10 +10389,11 @@ in with self; {
   modeLLtest = derive2 { name="modeLLtest"; version="1.0.0"; sha256="1f80bgw1l6zgwlhz1agdrl5d44jfrk50yi3jgwf14l4zjx8x8rp3"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; };
   modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; };
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
-  model4you = derive2 { name="model4you"; version="0.9-3"; sha256="03s87dklil69znflny9vcl934yisfb13d0gdk94279cb4hb693c0"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
   modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; };
   modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; };
-  modelStudio = derive2 { name="modelStudio"; version="0.1.9"; sha256="076awi00q53vq471rx71kjzkdfrkkpazjmwawb5g8kjsvyplkrii"; depends=[iBreakDown ingredients jsonlite r2d3]; };
+  modelStudio = derive2 { name="modelStudio"; version="0.2.1"; sha256="0fxrfd9ylgy39ivrvcg3gfvfbwbxwwrjx0bvgzibmvb6p8fg68qr"; depends=[iBreakDown ingredients jsonlite r2d3]; };
+  modelbased = derive2 { name="modelbased"; version="0.1.0"; sha256="0jr29m536pn2v3h7vl898szl4cin8wll3mhl0gmx01a0naz9vsbx"; depends=[bayestestR effectsize emmeans insight parameters]; };
+  modeldata = derive2 { name="modeldata"; version="0.0.1"; sha256="0dzjgb5g60hgqppxvzin8m51clkw8d89if7dw5ha46j2paw1n5r9"; depends=[]; };
   modeldb = derive2 { name="modeldb"; version="0.2.0"; sha256="1qcgmv31gd1x0mzxq4lcarmswsr75qgq5zpfcwchxzrz97ncbwgd"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
   modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; };
@@ -10411,10 +10419,10 @@ in with self; {
   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.4"; sha256="0prd2avg3aj4y8zi7yd2sgcary8igqxrjcp0igail84kpnal53zq"; depends=[alphahull rgl Rvcg]; };
-  mombf = derive2 { name="mombf"; version="2.2.4"; sha256="19ksafq86as3gpdw20jfk3b8mqs689icbk8vhi5rpbq5ly4kqi91"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; };
+  mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo 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.3"; sha256="0kknqlmdq1xnjfgzm0qmx5ka37ga3cg3njd0h4flpvkc9bc9x36p"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel doRNG dplyr foreach geosphere ggmap ggplot2 gstat LaplacesDemon magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
+  momentuHMM = derive2 { name="momentuHMM"; version="1.5.0"; sha256="0qbl6vl9s30z3qh7c7g9ml7dr0rjicpw0m6wbjsan3isqj3aa6p6"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
   mongolite = derive2 { name="mongolite"; version="2.1.0"; sha256="0w9szs80a6isff6f2mwhh0wcigssf80v3njvisfczcj3cbwdqxnr"; depends=[jsonlite mime openssl]; };
@@ -10424,13 +10432,13 @@ in with self; {
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-13"; sha256="1hm5qf28bh0q7f4zcjqx1qxw3l8hzkx349c1y3nwyfg7436vff6a"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
-  monotonicity = derive2 { name="monotonicity"; version="1.3"; sha256="1h82aikpq5m54zfs1pg4mrajnss6hl0i65ka3rdywv96wmhwsdnr"; depends=[lmtest MASS sandwich]; };
+  monotonicity = derive2 { name="monotonicity"; version="1.3.1"; sha256="0bb6sl8yykry25a86qfggi36ggr1xrxcqsnzp6rb6na228hbwa2z"; depends=[lmtest MASS sandwich]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
   moonBook = derive2 { name="moonBook"; version="0.2.3"; sha256="0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6"; depends=[magrittr nortest purrr sjmisc stringr survival]; };
-  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=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
-  morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; };
+  morpheus = derive2 { name="morpheus"; version="1.0-1"; sha256="1zfx24ndlky0b6vg6an9vcjw955ms749dwb51x9gsj2m8vgrbpnn"; depends=[jointDiag MASS pracma]; };
+  morphomap = derive2 { name="morphomap"; version="1.1"; sha256="1sl006lrp041vapv6bibl47hpd5qbihjigkk0f5gs3839g6c1pwd"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; };
   morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
   mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; };
   mortyr = derive2 { name="mortyr"; version="0.0.1"; sha256="1mpgb9rcknghwm9xsn3d8s6fy4j319sinb6l76s8aq06n4f3hr7g"; depends=[httr jsonlite tibble]; };
@@ -10445,7 +10453,7 @@ 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.3"; sha256="0c3jnw2jwdrmvkcwlz8gp10pljix4l41yn3jnzxcsz6l3ib50mgr"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
+  mousetrap = derive2 { name="mousetrap"; version="3.1.4"; sha256="1iizlcq6ak9hfqwaz8d0zmijfnw2v7fwgksxng9mxiqiva98is8a"; 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.2.2"; sha256="14wmiyk52iar90kbzi6ksl75i0kg2nmsq08sms9rr2wgswr9f7km"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; };
   moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; };
@@ -10455,7 +10463,7 @@ in with self; {
   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-20"; sha256="14nkh161bwdja6b1gycijids387714pk1fhbrljphsilvldv3682"; depends=[bst doParallel foreach MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.3-21"; sha256="0sgfzpyzl2494d9nj09qs1dszpzsv9wwf79wj9aypjm8sndl18yj"; depends=[bst doParallel foreach MASS numDeriv pscl]; };
   mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; };
   mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; };
   mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
@@ -10467,7 +10475,7 @@ in with self; {
   mpoly = derive2 { name="mpoly"; version="1.1.0"; sha256="1ixidhgp6bfb31kwv7gfvra47zs2f9qa3pf00qrqxkn6zgjkbspd"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; };
   mppR = derive2 { name="mppR"; version="1.2.0"; sha256="0ij1r4pihlm79mywacz5fmgd6nww9026mp9a3hamslpn68pflvpz"; depends=[ggplot2 igraph qtl]; };
   mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
-  mpr = derive2 { name="mpr"; version="1.0.4"; sha256="13fqvndwxzqa1safa43ad90pkiqnpqmgr0pkwp8lwmnxqmrmj0jb"; depends=[survival]; };
+  mpr = derive2 { name="mpr"; version="1.0.5"; sha256="132ahy05zrh2164bffiywgbarxvzkc30k79w7ph9ca8d9mpgj70b"; depends=[survival]; };
   mpt = derive2 { name="mpt"; version="0.6-1"; sha256="13f48nflz6b3dk1d22ndfn22sdkz1rzhbh8c85lxk23qhfyc6fv6"; 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]; };
@@ -10476,7 +10484,7 @@ in with self; {
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; };
   mrbayes = derive2 { name="mrbayes"; version="0.1.0"; sha256="0p0a1g6xv7g3scmn290ja4bicbdz5c9y6c4hfn4c7advd6ha6ang"; depends=[]; };
-  mrbsizeR = derive2 { name="mrbsizeR"; version="1.1.1"; sha256="0a69yyxxf4p84c2sx9kkaxgpfyck88cn0ajlnm64arrr9r99iiir"; depends=[fields maps Rcpp]; };
+  mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1"; sha256="0kvzvbvw3ygx09bjil7wqw2345dzh1bkbaqdk4q5c1szk95rw93b"; 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]; };
@@ -10503,41 +10511,43 @@ in with self; {
   msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; };
+  msgr = derive2 { name="msgr"; version="1.1.2"; sha256="15s3d77xqczjydgcfx4jlsq408hgsm8yzqk5248v58vm6zy36mh0"; depends=[purrr rlang]; };
   msigdbr = derive2 { name="msigdbr"; version="7.0.1"; sha256="19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd"; depends=[dplyr magrittr rlang tibble]; };
   msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; depends=[mclust]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
-  msm = derive2 { name="msm"; version="1.6.7"; sha256="0fp2s8jbj75wf4mk03rp5pzjkrmwd1rp4m5dxz83w0qn37vc00vm"; depends=[expm mvtnorm survival]; };
+  msm = derive2 { name="msm"; version="1.6.8"; sha256="1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk"; depends=[expm mvtnorm survival]; };
   msma = derive2 { name="msma"; version="2.0"; sha256="15g8cwafbd5bsff3cd53yzgxacsswgl0rzygr40drs7nwsi4qbk1"; depends=[mvtnorm]; };
   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]; };
+  msos = derive2 { name="msos"; version="1.1.1"; sha256="0jp4xw03iwc6dkk93kkky9k6xd285ylzp1x7jxkl3h0884jvyjyf"; depends=[mclust tree]; };
   mssm = derive2 { name="mssm"; version="0.1.3"; sha256="1d1iksvm97g42p4y3jfzrk0xf4bbw8n237dcmy9jjyaw9vlxw61h"; depends=[nloptr Rcpp RcppArmadillo testthat]; };
   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]; };
+  mstate = derive2 { name="mstate"; version="0.2.12"; sha256="0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"; depends=[RColorBrewer survival]; };
   mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; };
-  mstknnclust = derive2 { name="mstknnclust"; version="0.1.0"; sha256="1q7cx4yjgdvwkjfx07dywlh02zd3002165wh88aqhs3999jhnpnz"; depends=[amap igraph]; };
-  mstrio = derive2 { name="mstrio"; version="11.1.4.25"; sha256="017g2y0imfhn6d9k1fa1h9ckln6mmn7adn5dj2fa8mdf6mygbxdb"; depends=[httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; };
+  mstknnclust = derive2 { name="mstknnclust"; version="0.2.0"; sha256="10fwl90ykk4i839shy588gxag185x6c397brn57917yiiyqfamq2"; depends=[amap igraph]; };
+  mstrio = derive2 { name="mstrio"; version="11.2.0"; sha256="1d4vgmbrkalbdglydnwld09jgw5zidiwrzy83f1168zmm5lfg30x"; depends=[httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; };
   msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; };
   mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; };
   mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; 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]; };
-  muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
+  muHVT = derive2 { name="muHVT"; version="1.0.1"; sha256="0qxfnnz88h00a2zfx0kagv7g4w3ck74x1zqcmxgrvwpdy3z851zn"; depends=[conf_design deldir dplyr ggplot2 gtools Hmisc magrittr MASS plyr polyclip purrr rgeos sp splancs]; };
+  muRL = derive2 { name="muRL"; version="0.1-12"; sha256="1nzi0nyspva5ach0q0rvlljlfgmac8vxxggkwdzz1pr1cxhkprwd"; depends=[maps stringr]; };
   muRty = derive2 { name="muRty"; version="0.3.0"; sha256="1125182flpz6a90dh3gldyhlnh9l605cb59b92j3d0p754ansdrm"; depends=[clue lpSolve]; };
   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.7"; sha256="11njbm97ipzlkjx9vbijq5i1s3w509bgj1g2mgz1h624qa0lf5pa"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; };
+  mudata2 = derive2 { name="mudata2"; version="1.1.0"; sha256="094xvcw80grfz1q8al8pcnz14drf69amyn3phpav90znnk6b9bhn"; depends=[dplyr fs ggplot2 glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; };
   mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; };
-  mudfold = derive2 { name="mudfold"; version="1.1.1"; sha256="1lxlzzjvjqyivc8g8z6f8s0zkxf0k6mi76y5zm36r1kalhxyhkdy"; depends=[boot ggplot2 gtools reshape2 zoo]; };
+  mudfold = derive2 { name="mudfold"; version="1.1.2"; sha256="1g66axwrrvlsb03yhwa16pvxbl2wvpm7fzzl6nlw0cxlh99w7r33"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; };
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6.1"; sha256="08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
   mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; };
   multDM = derive2 { name="multDM"; version="1.0"; sha256="06vjbsjmqdnndpqacfpgq5w8q6xg81s7vd9fhwdkww3adr7r8cg3"; depends=[]; };
   multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; };
-  multcomp = derive2 { name="multcomp"; version="1.4-10"; sha256="1kzmdn9jmz5bmhf3wsfr12ljbasmwsgcsfdia52k0bi6q0swdg19"; depends=[codetools mvtnorm sandwich survival TH_data]; };
-  multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
+  multcomp = derive2 { name="multcomp"; version="1.4-12"; sha256="14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b"; depends=[codetools mvtnorm sandwich survival TH_data]; };
+  multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; };
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; };
   multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; };
@@ -10556,7 +10566,7 @@ in with self; {
   multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; };
   multicolor = derive2 { name="multicolor"; version="0.1.3"; sha256="0jniqa8zrl13534pyl200i54m52lhfwq7h7irf806ga70lvfgk0k"; depends=[cowsay crayon dplyr glue magrittr purrr stringi 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]; };
+  multicool = derive2 { name="multicool"; version="0.1-11"; sha256="0xk408qbz9cxwf51j3pmy55gcjcnws8mc6j3vyn9zhramxj7x40w"; depends=[Rcpp]; };
   multicross = derive2 { name="multicross"; version="2.0.0"; sha256="1ic632ig0mzvq00hrkjs8vfa5mzp8vwrqflfqfdr5wkdvcqqnhbb"; depends=[AnnotationDbi crossmatch MASS Matrix nbpMatching org_Ce_eg_db org_Hs_eg_db org_Mm_eg_db Seurat]; };
   multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
@@ -10564,13 +10574,12 @@ in with self; {
   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]; };
-  multilevelMatching = derive2 { name="multilevelMatching"; version="1.0.0"; sha256="11xb52z4pkikpbba98pviy2zvggf5dlqqd987vd8f3r7wxqpl2rk"; depends=[boot MASS Matching nnet]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
-  multimark = derive2 { name="multimark"; version="2.1.1"; sha256="08m25qg9w691i3sj023hbca5p3523nfi3kb25wk4abm97ixzf0s3"; depends=[Brobdingnag coda doParallel doRNG foreach Matrix mvtnorm prodlim raster RMark sp statmod]; };
+  multilinguer = derive2 { name="multilinguer"; version="0.0.3"; sha256="0j7v0d0xibxk8ir09pxb3v13xlm7h35phhgw2cxfd934z146x8v9"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; };
   multimode = derive2 { name="multimode"; version="1.4"; sha256="142k2jbi6y9aaqz9cwl4wk2m1y1n1fgvk873nk3psdv2h6r77slx"; depends=[diptest ks rootSolve]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-  multinet = derive2 { name="multinet"; version="3.1.0"; sha256="0skxk1h7ax11mlc7pffb7m5p86baamcc8d6v93y9vz91j8304g5w"; depends=[igraph RColorBrewer Rcpp]; };
-  multinets = derive2 { name="multinets"; version="0.2.1"; sha256="00h1nqi49mix5rxp39i46pimmr3rl0c2869g7ss8cy0kl8hl41hz"; depends=[igraph igraphdata Rcpp]; };
+  multinet = derive2 { name="multinet"; version="3.2"; sha256="00v0ac3pizdf8r6sm45hdrpj487pgcw9snf26zqcyhhlx5b8wicz"; depends=[igraph RColorBrewer Rcpp]; };
+  multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
   multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; };
   multipanelfigure = derive2 { name="multipanelfigure"; version="2.0.2"; sha256="0f24b0msx6y9ccdi65d8rxf589vw5rz6pxwa55bivq8cy5s4gc27"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; };
@@ -10583,7 +10592,7 @@ 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.2.3"; sha256="00fs0mbx3vhs0xkcjxr1i44a2qi99bvhiikkm30m3kbalny5nn01"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr]; };
+  multistateutils = derive2 { name="multistateutils"; version="1.2.4"; sha256="1h1hi9pv28dbznjnafybjlbk196rj2f8lwrzwq2a5cpj0q7s582f"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr]; };
   multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; };
   multivariance = derive2 { name="multivariance"; version="2.2.0"; sha256="1877yym7fhnjhjdfchpdjrcyz10w7flsvjq78s51y0km0rblycph"; depends=[igraph microbenchmark Rcpp]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
@@ -10597,7 +10606,7 @@ in with self; {
   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.5-1"; sha256="1x5nh4h35mkajsdgi4vrvs1cd4iagdrp9al2a6lll96jw0y1c65y"; depends=[rootSolve spacesRGB spacesXYZ]; };
-  murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; };
+  murphydiagram = derive2 { name="murphydiagram"; version="0.12.2"; sha256="0f699cdfsl4f9w9f18cxkdlq1vyhsv83ynl6ck0r3wwh8f1zsmnd"; depends=[]; };
   music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; };
   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]; };
@@ -10607,25 +10616,24 @@ in with self; {
   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.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; };
   mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; };
-  mvMORPH = derive2 { name="mvMORPH"; version="1.1.0"; sha256="0v63wi4la5kw59xdl1bmsc8hh8gfpm89s79dzrkbdkmakm740vvx"; depends=[ape corpcor glassoFast phytools spam subplex]; };
+  mvMORPH = derive2 { name="mvMORPH"; version="1.1.1"; sha256="101ds24bir84yj7cnc4l4yv85xga981mk5ap420f3r9lp8db3h6x"; depends=[ape corpcor glassoFast pbmcapply 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]; };
   mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; };
-  mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.1"; sha256="0p9rappzbz68jhgia9w3kpiy0x2gzm74mc1ap2xcyvk13y9pgvyz"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; };
+  mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.2"; sha256="1df9lwj9f65sw8jd2cxjg08p6z9llpxjzyjcryn764a4ncnx7gf3"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; };
   mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
   mvabund = derive2 { name="mvabund"; version="4.0.1"; sha256="0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
   mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; 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.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; };
-  mvcwt = derive2 { name="mvcwt"; version="1.3.1"; sha256="1hmjps51xcjz5ahz7gxmzhpvspmbvhi0jshbv7cgly8bh294a3vf"; 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-2"; sha256="00zxqby8syb959fqgw9i7b0yamgjwddq32jlin6qmnzys5bg1556"; depends=[MASS Matrix numDeriv]; };
   mvgraphnorm = derive2 { name="mvgraphnorm"; version="1.81"; sha256="14sfnm0pikv82abiqfv2m1bziwyy2r0bmhq64j783cyppv5fb69z"; depends=[bnlearn corpcor igraph Matrix mvtnorm qpgraph]; };
   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=[]; };
+  mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
   mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; };
   mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; };
@@ -10640,15 +10648,14 @@ in with self; {
   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.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-11"; sha256="0lkjph661blc1nwfzg9w48a60wvj6ffh4zjwlisvracsx4nn2883"; depends=[]; };
+  mvtnorm = derive2 { name="mvtnorm"; version="1.0-12"; sha256="03rfmii9j8x8fjv7hp8qd28z0svl4w0x54k2f4jpwv4qa7079i24"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.7"; sha256="0g0yddsgdfyvqaj59qi6k3sknpbppdmgvq0rgnil5q8ki5skvgis"; depends=[Rcpp shiny]; };
   mwshiny = derive2 { name="mwshiny"; version="2.0.0"; sha256="07x36dymd79aziz8k3sfx7l82xzmv43pkwndsfv9ii58q7nli1hz"; depends=[shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-  myTAI = derive2 { name="myTAI"; version="0.9.1"; sha256="0pbyxbrbbaadi5k2yp79lr6r56gjq65hmin3ssr032xipgw0d97l"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; };
+  myTAI = derive2 { name="myTAI"; version="0.9.2"; sha256="1inf6625qxr57jkwx5h3f3rdmlxf74my8bvigl8hxivd9z5z3wbl"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
   mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -10659,16 +10666,17 @@ in with self; {
   nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3.1"; sha256="0qylbwn064smdw2adyx1hxwy4m320g78ihllfnss4kkmxk0ki05z"; depends=[boot lattice MASS psych]; };
-  nLTT = derive2 { name="nLTT"; version="1.4.1"; sha256="1m4q4s6dwl3yz403w8bpzxakcckd8wylws0hvh6ab72bin74fdid"; depends=[ape coda deSolve testit]; };
+  nLTT = derive2 { name="nLTT"; version="1.4.3"; sha256="0gpmlvam7k4gsiidblfl4f57mgkbq2pakzqak4yx4pxa9f8gpilm"; 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=[]; };
+  naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; };
   nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.16.2.0"; sha256="0gvpl8jrczk9afc7qg6w8w0gn28nia5mh3vanlsp7j0kj3vzqqc5"; depends=[Matrix]; };
   naivebayes = derive2 { name="naivebayes"; version="0.9.6"; sha256="1rmpc7ynnl909m20njdy5nc7siqqlj5xra3ry41b0pgb966ijcdz"; depends=[]; };
   naivereg = derive2 { name="naivereg"; version="1.0.2"; sha256="11prmwb6jc0la4w2qlmbr9n529sn4mv3zm9h80svg6gs119a9yb0"; depends=[gmm grpreg ncvreg]; };
   nakagami = derive2 { name="nakagami"; version="1.0.0"; sha256="1i9m1nlqfdk9k3bzf8qlfc11spzfqly49n1pk7phvykzjgd1c1s4"; depends=[assertthat]; };
   namedCapture = derive2 { name="namedCapture"; version="2019.7.30"; sha256="12cnd16015ig0qx41gfkf7915iyzlaa7ixdv72x9vx3rylw86y4q"; depends=[]; };
-  namer = derive2 { name="namer"; version="0.1.4"; sha256="0ika1imdrslfycbsg6zrssgghsc729ah4yvgjpv9kykppw098qwd"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; };
+  namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
   nandb = derive2 { name="nandb"; version="2.0.5"; sha256="0y1lw79mpvyfbxfzjrdfnpgny4s2axbl23gl67fj45jrbjh56wxz"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; };
   naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; };
@@ -10682,10 +10690,9 @@ in with self; {
   nasapower = derive2 { name="nasapower"; version="1.1.3"; sha256="1grfbj68vxsy50a0zylgfddwgr3ilrk2v60755vra9ckpmnf31zi"; 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.13"; sha256="12n81jzlzamnpkf5inczfc1x8qmfibszpkakpyc0q7r7wgpykbgv"; 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]; };
   nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
-  nationwider = derive2 { name="nationwider"; version="1.0.0"; sha256="0g4lz39gn1xwxk0jd14bl70q7c537bdpclra26lqqg1xj0jcfmm1"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; };
+  nationwider = derive2 { name="nationwider"; version="1.1.0"; sha256="01hp8igbvbn1qa203cdnlwnfzymjifzmzcyfaszzf9q4f17f07r8"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; };
   natserv = derive2 { name="natserv"; version="0.3.0"; sha256="0plfcf9c1lwfmac3nnx07hyhpr12q6mfmmj0dz8xyxdspd2ps81w"; 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=[]; };
@@ -10711,7 +10718,7 @@ in with self; {
   ndtv = derive2 { name="ndtv"; version="0.13.0"; sha256="1qfjvq5wch256gmg7pw9jwda33r4963a8p8jmp27cmpzdwycvnzy"; 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.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; };
-  neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; };
+  neat = derive2 { name="neat"; version="1.2.1"; sha256="0ifx2qbr8g6myz380rwayas26vg13wkblssvma4kbgfksw7cccgj"; depends=[igraph]; };
   neatRanges = derive2 { name="neatRanges"; version="0.1.0"; sha256="0g6b5mi57ajqwn8s09rw1njc1v4lrqy5dcnlphwx9i89lfa8lbah"; depends=[data_table]; };
   neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; };
   needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; };
@@ -10721,10 +10728,10 @@ in with self; {
   neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; };
   neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; };
-  neonUtilities = derive2 { name="neonUtilities"; version="1.3.1"; sha256="1cqa9ziy1jifsxnbdfd9d5dz5j4w87vzlpngf1aw4h5g1z11sq9l"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr tidyr]; };
+  neonUtilities = derive2 { name="neonUtilities"; version="1.3.3"; sha256="1lmk2h58ablfggyicyhndw3n74lrpb7zcp5y1nh24i0mkqrf6gfm"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate pbapply plyr readr stringr tidyr]; };
   neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
-  nesRdata = derive2 { name="nesRdata"; version="0.2.0"; sha256="1cr5d600bnslxbm2kknzwivvb4zyfsrf8rbrk3kk0j6dpclx5x6s"; depends=[dataone dplyr purrr rappdirs readr]; };
+  nesRdata = derive2 { name="nesRdata"; version="0.3.0"; sha256="06wnm1bv7i2r6sj2hyk1zypwhr3ir89gh2bkd6kmhb7s5wv6cd5v"; depends=[dplyr purrr rappdirs readr]; };
   nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; };
   netCoin = derive2 { name="netCoin"; version="1.1.23"; sha256="0v5ia8iwn7i21a5xa6wjnm1pn1z1y0ccbg6qqnfzg01x1d751s5q"; depends=[haven igraph Matrix]; };
   netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
@@ -10733,19 +10740,18 @@ in with self; {
   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.2"; sha256="0fscbpn8dvaflnk06rpnxydvq1292l233rlxw14nkmm7d0508g9x"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; };
-  netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
+  netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; };
   netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
   netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; };
-  netmeta = derive2 { name="netmeta"; version="1.1-0"; sha256="16cf7cam63f07lfmvj5g8rqrdagyzphnsp4pxaklgnx5wwjwj3wj"; depends=[ggplot2 magic MASS meta]; };
+  netmeta = derive2 { name="netmeta"; version="1.2-0"; sha256="0cy123bs5azg5yinncmgzaxm0m33dzxbwjh0xlvwv2v27m4w4sqk"; depends=[ggplot2 magic MASS meta]; };
   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.16.0"; sha256="0dnf1wl3za2lhx2lwd8smhlijl1cfhckgr8zz9piiirrfi2m2kx2"; depends=[magrittr tibble]; };
   networkABC = derive2 { name="networkABC"; version="0.5-3"; sha256="0f3wbm76i8m9f52b0zvb2fvziqh43xy67llnv4lm54yj5szxvjr0"; depends=[network RColorBrewer sna]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
-  networkDynamic = derive2 { name="networkDynamic"; version="0.10.0"; sha256="1dgk3lj1fx0x6ccyp6h6rkzbjqqd8nflilqs4dfi8sm0fcndfcgb"; depends=[network statnet_common]; };
+  networkDynamic = derive2 { name="networkDynamic"; version="0.10.1"; sha256="183cnxbcly887vmxcvyvwcn19i8s7yyb57k1q5vhimx8vvcxivi2"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; };
   networkGen = derive2 { name="networkGen"; version="0.1.1"; sha256="1vnh5dajiaf47kx1sxyp744mlk3yvl4sxj380i3b3ic1wlgyd2h1"; depends=[igraph mgcv]; };
   networkR = derive2 { name="networkR"; version="0.1.2"; sha256="07dq3syk0hr1kc2mqd70g0ih09hamd7rxxms60dyvnpm8978c1wz"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; };
@@ -10757,7 +10763,7 @@ in with self; {
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; };
-  neurobase = derive2 { name="neurobase"; version="1.27.11"; sha256="12qjxvr1s0k2hrbnxs7cysz458z3m5wcgia8d64zih16hzbrjg9v"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
+  neurobase = derive2 { name="neurobase"; version="1.29.0"; sha256="16y1d4qg4d57l43080vlpn5jnh462qnv9z0w6dv0zwlk74psm9ha"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
   neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
@@ -10766,22 +10772,23 @@ in with self; {
   neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; };
   newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; };
   newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; };
-  newsmap = derive2 { name="newsmap"; version="0.6.9"; sha256="1s7ldabclmv2qfkczj17vbj3630ab6xfc1x020szdy9fa08380wp"; depends=[Matrix quanteda stringi]; };
+  newsmap = derive2 { name="newsmap"; version="0.7.0"; sha256="1fhpkih37i4abrv9ili1vpwk4pgmnhq5d5flqjdi025h9gb0zq8y"; 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.3"; sha256="0196hnbqw9bji3bl2phjs9z5n84x5fs7iiirfd6gjyqv9xlfwd2p"; depends=[configr data_table future optparse stringi stringr]; };
   nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhdR = derive2 { name="nhdR"; version="0.5.2"; sha256="0qi7ls10pdjcihkdnhbvbnv8dwcy1448pd5fzhpy0kjky7hfi7bj"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; };
-  nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.11"; sha256="17kskpp6m8d2as21ii0l1m2gpsc3yfcgznng4gakb49d476365zy"; depends=[dplyr httr igraph jsonlite magrittr R_utils RANN sf units xml2]; };
+  nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.12"; sha256="0111yy4pqxhqz7lk30zm7lryzarpjlxnvkzvix630xzvms8jkx1n"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; };
   nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; };
+  nhlscrape = derive2 { name="nhlscrape"; version="0.1.2"; sha256="06k7pabyz0nbx1z6p2d3cymf6jph4gxa4fhzfgqzzqg9ai5kmccq"; depends=[DBI httr jsonlite RSQLite rvest xml2]; };
   nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; };
   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-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; 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.8.0"; sha256="0zfxv1bvvdyzdg2b0wvrc9x6y52jyqjm9ffikaql1acalblqws5y"; depends=[coda igraph R6]; };
+  nima = derive2 { name="nima"; version="0.6.1"; sha256="0rfb624pap2ga19vll6hbvjh2jr8dh3i1bj1h8qpqpb5nk6lkf4x"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; };
+  nimble = derive2 { name="nimble"; version="0.9.0"; sha256="04anz8xfkdv2c00hax305lycp0gzjspsq34hfgm3w51kz6nqzhpb"; depends=[coda igraph R6]; };
   nimbleEcology = derive2 { name="nimbleEcology"; version="0.1.0"; sha256="195g1hcx7fyqx2la2ci88m2bykcnzrv27k4q4qq3z69c54fc5p7d"; depends=[nimble]; };
   nipals = derive2 { name="nipals"; version="0.5"; sha256="1zrn1ykl9scd988wj3mm0j6g5q6lq04iwn2ibgap1lrsd0rw1zbf"; depends=[]; };
   nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; };
@@ -10793,17 +10800,17 @@ in with self; {
   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-142"; sha256="0figfb1i22hfkkhzpprmpp723s01r43x725a1ab0pc9gsxqg90nx"; depends=[lattice]; };
+  nlme = derive2 { name="nlme"; version="3.1-143"; sha256="13iixbs2ibldc75rl7rav5n5kx33zwm33xnfw1yvlkpcqf38bd22"; 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="1.1.1-3"; sha256="04gm74mjwz8fidapk0040fghy4wpj19412n54v8wli10xjwwb76w"; depends=[BH brew cli crayon digest dparser fastGHQuad flextable generics ggplot2 huxtable lattice lbfgs lbfgsb3c magrittr Matrix memoise minqa n1qn1 nlme R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders stringr sys tidyr vpc yaml]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
   nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; };
   nlpred = derive2 { name="nlpred"; version="1.0.0"; sha256="0a13agsacn7qw2i8ggd9v8w7k44r4faby1vv163gsa764ppj70m4"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; };
-  nlr = derive2 { name="nlr"; version="0.1-3"; sha256="19zcnigijr3jfy4da945z4fdnrirvlmpqminaf5wwk0bz71f3b61"; depends=[GA MASS nlme quantreg robcor TSA tseries]; };
+  nlraa = derive2 { name="nlraa"; version="0.53"; sha256="064mbajrpwm2pkiyb9lwmhhf3gxzkixay3vdz9lgfd3rr9gfrk06"; depends=[knitr nlme]; };
   nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
-  nlrx = derive2 { name="nlrx"; version="0.3.0"; sha256="01wvhl339qizi7hlz7dclmn6nv489vh71mpk8c8imyj9ckx3z18c"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
+  nlrx = derive2 { name="nlrx"; version="0.4.0"; sha256="0b5szfg20szzip6ylafgv94nx34dp4qcyg83lcip0kvz597ymd66"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
   nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
   nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
   nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
@@ -10819,9 +10826,9 @@ in with self; {
   nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; };
   nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; };
   nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; };
-  nmadb = derive2 { name="nmadb"; version="1.1.0"; sha256="062h24w0678bgzn5l5qa3nchl0a121f7623acl0ljida53zx81wp"; depends=[devtools jsonlite RCurl readxl]; };
+  nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; };
   nmathresh = derive2 { name="nmathresh"; version="0.1.4"; sha256="0nsywahzph06c7grk3ch65fvll4ninqz97y007d6qdqgmym9vxjq"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
-  nmfem = derive2 { name="nmfem"; version="1.0.4"; sha256="0qn3p244i8mkmqhsjnyas2r2hcb21npn2jykf6dg7w2f1ddhbfbx"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
+  nmfem = derive2 { name="nmfem"; version="1.0.5"; sha256="0hlddml20bp38yp1dji3l9mc1vnzmdrj6myf19n9p9xb85a30b9c"; depends=[capushe 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.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
@@ -10831,15 +10838,14 @@ in with self; {
   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.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; };
-  nngeo = derive2 { name="nngeo"; version="0.2.9"; sha256="1cxrr7k2rjzg2bw43c2mr9jnr9mwwaln5j2xivmrfq2lcrhll0fi"; depends=[igraph lwgeom RANN raster Rcpp sf sp stars units]; };
+  nngeo = derive2 { name="nngeo"; version="0.3.0"; sha256="056xsffd7sn430lqmjsisk04929d44zqnwyikcdp46zhqyqpnk2m"; depends=[igraph lwgeom RANN raster Rcpp sf sp stars units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; };
-  noctua = derive2 { name="noctua"; version="1.2.1"; sha256="0pahdwb68xxbcg9accb2fjmcj1z8alk0kfv6dvcbidgnx7b601c1"; depends=[data_table DBI paws]; };
+  noctua = derive2 { name="noctua"; version="1.5.0"; sha256="0r6fwrvhss64hp6kpk2qg9pawav3sfapxqj65fm32zi8643ly5hc"; depends=[data_table DBI paws]; };
   nodbi = derive2 { name="nodbi"; version="0.4.0"; sha256="1jlqzj9lv9wnsb8hwy8y91369i6ykp8av35abakfpxg0302svay9"; depends=[data_table jsonlite]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.3.0"; sha256="1z0xqdfplg5rz94qcnks435md3q7jpd5f32jfm0pqnyr3536gs03"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
@@ -10849,7 +10855,6 @@ in with self; {
   nomnoml = derive2 { name="nomnoml"; version="0.1.0"; sha256="0yzbs9by2fvwvxpl2xzjikzcjv8dvcr5v2v82ibz5jpnnsbl1ac4"; depends=[htmlwidgets png webshot]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
   nomogramFormula = derive2 { name="nomogramFormula"; version="1.1.0.0"; sha256="1cblsxyyizsjz079qlbvhmb51n2cmxxsrh1ca7xwxc0zj6ihg02w"; depends=[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]; };
   nonet = derive2 { name="nonet"; version="0.4.0"; sha256="1043vplj8libbzll172h82dfwnz2lsdba5na2g9liryg8p08h4v8"; depends=[caret dplyr e1071 ggplot2 glmnet pROC purrr randomForest rlang rlist tidyverse]; };
@@ -10879,8 +10884,8 @@ in with self; {
   nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; };
   nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; };
   nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
+  nosoi = derive2 { name="nosoi"; version="1.0.0"; sha256="0g4s8324k46m8gfj1mdjiqz2cw4ips7nnzl8xyar89ylqy7gvqiw"; depends=[data_table dplyr magrittr raster reshape2 stringr]; };
   not = derive2 { name="not"; version="1.2"; sha256="1671j3yirzdyhb02khx1yddslyig5jlnb0bdbgdlkb21n4zwaqa4"; depends=[]; };
-  noteMD = derive2 { name="noteMD"; version="0.1.0"; sha256="1365jp54srjsb3rxvr3bi50jpbp9ap311ah1jspcihdg07zqn4n9"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; };
@@ -10898,7 +10903,7 @@ in with self; {
   npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; };
   npcp = derive2 { name="npcp"; version="0.1-11"; sha256="0zkf01rv065x6sg8b8yal6125wbvjzaris5l9ghn2279q1fwdqz3"; depends=[]; };
   npcure = derive2 { name="npcure"; version="0.1-4"; sha256="0fdl903akry53cbk3cpmsfgzj71vmpz9qksk1dzrg8yzsql37mf6"; depends=[permute zoo]; };
-  nph = derive2 { name="nph"; version="1.9"; sha256="0myy7rq3l1qjfkih6idggg7p9rfh352pvzmasbihi71wcdyibhni"; depends=[ggplot2 mvtnorm]; };
+  nph = derive2 { name="nph"; version="2.0"; sha256="037vh3x3zlgg7jcbbwvcrlhm38d17zgz0m6d54y84mcclzzyc746"; depends=[ggplot2 mvtnorm]; };
   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=[]; };
@@ -10908,10 +10913,10 @@ in with self; {
   npordtests = derive2 { name="npordtests"; version="1.2"; sha256="1axzcyy45h3rs67m0i3cvwbmza1mnmraxan9j4zlpxdd5x9nz4h8"; depends=[]; };
   nppbib = derive2 { name="nppbib"; version="1.1-0"; sha256="1dcqcf2jhlz3n4d2kjix8wray9c7yaawfdbdg9lcrih1m7b8gmsy"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
-  npreg = derive2 { name="npreg"; version="1.0-0"; sha256="0idbradahyj6qm7nqrhvnfzly38x4apnbxslkk2i15ldvv50bfh7"; depends=[]; };
+  npreg = derive2 { name="npreg"; version="1.0-1"; sha256="0fsx71hc26zc26rwnvmmbrcy970xq92s63zllfa2q81c3jyf2qsh"; depends=[]; };
   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.2.1"; sha256="086x6p4ipd910nnm2whsvbjkvmjny69ryh0lw0j5jjq2ddah5p1i"; depends=[ggplot2 Rcpp RcppArmadillo]; };
-  nproc = derive2 { name="nproc"; version="2.1.4"; sha256="1gj38yppip0ygxcgp0x9ba9kpr12ahmz2k0956x3h7py2rl8b098"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
+  nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; };
   npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; };
   npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; };
@@ -10919,6 +10924,7 @@ in with self; {
   npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; };
   npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
   npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; };
+  npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; };
   nptest = derive2 { name="nptest"; version="1.0-0"; sha256="13h93sx5fsbfiy3q88j4bl0p3hwqzi8l4ab0r0qha78dzd6skq2v"; depends=[]; };
   nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; };
   nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; };
@@ -10926,8 +10932,8 @@ in with self; {
   nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; };
   nsarfima = derive2 { name="nsarfima"; version="0.1.0.0"; sha256="0iw1daha6c2l4zmqa0m917kgbx3d7mh7bhwbrsyxmvr5qs81drhk"; depends=[]; };
   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.19"; sha256="107ri9325ga4kgvs5a3j3698dc3m4v28cb02ypc4dan6f3fa9h8i"; depends=[coda mcmc mcmcse np Rcpp sandwich]; };
+  nse2r = derive2 { name="nse2r"; version="0.1.1"; sha256="09mj8qjjzsg9x65f9wky8y5gvjslkkg9j8vy9mpp4j9dxl0z2mi6"; depends=[httr jsonlite magrittr purrr rvest shiny stringr tibble xml2]; };
   nseval = derive2 { name="nseval"; version="0.4"; sha256="18avir5zllvm2sbi9616k7dlb8yxhvnbji7xshr4kcfvy1fvn2ia"; depends=[]; };
   nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; };
@@ -10949,13 +10955,12 @@ in with self; {
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
   nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; };
-  nvmix = derive2 { name="nvmix"; version="0.0-2"; sha256="18825p8hdrfiznjkgx26i2qmhpyj9ky1kc4k2az7d29pnrjnyjdg"; depends=[Matrix qrng]; };
+  nvmix = derive2 { name="nvmix"; version="0.0-3"; sha256="0dvx21nfp82s7bk5vd9xxp9979w4mq8v1hx1zxa97sv2xr4g2m5y"; depends=[Matrix qrng]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
   nycflights13 = derive2 { name="nycflights13"; version="1.0.1"; sha256="0h4jzg4q5qpvjp5b2wlk3a2mh0jhyz9c1acdjcmg70pap7fyh0fj"; depends=[tibble]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
-  nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.3-1"; sha256="03n0j9xb3qgjrqwh8rw5vqyf71223knhfvb7bki4zp2hm00k9ywq"; depends=[httr jsonlite rstudioapi stringr]; };
+  nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.4-2"; sha256="0cqsqbvj8wwhcspw5m6v1r7pwlzggpskj5xg0y1yr7rsj4qw26c5"; depends=[httr jsonlite rstudioapi stringr]; };
   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]; };
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; };
@@ -10976,7 +10981,7 @@ in with self; {
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
   occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
   oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; };
-  oceanis = derive2 { name="oceanis"; version="1.0.5"; sha256="0fdcrwyv8idnspx1z82x92jh8iy58dcbqz97kammbs74ywjsgq34"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; };
+  oceanis = derive2 { name="oceanis"; version="1.0.6"; sha256="16sww5552xx04np8dxlqlhn1qzhjdmwd1z7b8dp9pskxbr9fhdb4"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; };
   oceanmap = derive2 { name="oceanmap"; version="0.1.0.1"; sha256="0cdv5rizrlbzz1ifcqh726kmki0j68w829k9f0cfnckmh3rwj2y6"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
   oceanwaves = derive2 { name="oceanwaves"; version="0.1.0"; sha256="0izgnqjji3xrvv8xbpsdbrx53wdb3rg3045xx6gcknfl2fj5iky7"; depends=[bspec ggplot2 signal]; };
   ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; };
@@ -10984,10 +10989,11 @@ in with self; {
   oclust = derive2 { name="oclust"; version="0.1.0"; sha256="005ml6vhi9rw6js2v4f1dc2ci8kcd7iwrkgbs4c1qxc836ygq0yx"; depends=[entropy mclust]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
   ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; };
-  odbc = derive2 { name="odbc"; version="1.2.0"; sha256="12crw6xxyd1cj911ihkfifrpwvdl4jjpjzi7l8pi6y658r2q5mdx"; depends=[BH bit64 blob DBI hms Rcpp rlang]; };
+  odbc = derive2 { name="odbc"; version="1.2.2"; sha256="1p30n1f6yfx80rk29l94asdi0chk4c7h6pp09aq9bbsq9g8109dq"; depends=[BH bit64 blob DBI hms Rcpp rlang]; };
   odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; };
   odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; };
   oddsratio = derive2 { name="oddsratio"; version="2.0.0"; sha256="0lr56djlw52j3azvifcdbyn01b85jv18gm789s7skmnylrl3rgw9"; depends=[ggplot2 mgcv stringr tibble]; };
+  oddstream = derive2 { name="oddstream"; version="0.5.0"; sha256="1nwjw7fq6b4jdq4m2w0a7xgmzjg5a6pbma1d3r9msiz8rnhb0c54"; depends=[dplyr ggplot2 kernlab ks magrittr MASS mgcv moments mvtsplot pcaPP RColorBrewer RcppRoll reshape tibble tidyr]; };
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
   odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; };
   odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; };
@@ -11003,6 +11009,7 @@ in with self; {
   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]; };
+  olr = derive2 { name="olr"; version="1.1"; sha256="1l6m2gbglh8idy4k2q23qgfb7in1a6pnwiji1gbygfan6paw4xza"; depends=[plyr]; };
   olsrr = derive2 { name="olsrr"; version="0.5.2"; sha256="13qampcc07qfjj4r3ira0m1j2wgnrkf5p1wswr9g814azhm52haz"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
@@ -11022,10 +11029,10 @@ in with self; {
   onnx = derive2 { name="onnx"; version="0.0.2"; sha256="0gyyaplq20cb0bilnmx0k2cm7yzrfvwsawdzs0bha1p5b83l003v"; depends=[reticulate]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
-  ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
+  ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.3"; sha256="1rh3cpj3r82xp4gqvspvgwwi3a29gyi0azrf4r1nshhi8qdx9avw"; depends=[ontologyIndex Rcpp]; };
   oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  opalr = derive2 { name="opalr"; version="1.2.0"; sha256="1kix8lndy741bm9rksy7bgmwj1g8ndzjdbq26b4z7xpkscbrmkx7"; depends=[httr jsonlite mime xml2]; };
+  opalr = derive2 { name="opalr"; version="1.3.0"; sha256="029sxy31in377p7s25y601vmdhcxxs6cn36xvqhkxcx15j96mprp"; depends=[httr jsonlite mime progress xml2]; };
   opart = derive2 { name="opart"; version="2019.1.0"; sha256="0yw4vlip4whhvp23yjr57h5j0ii8ighp77g3fjjzr3l56slmrmcz"; depends=[]; };
   openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; };
   openEBGM = derive2 { name="openEBGM"; version="0.8.2"; sha256="0v6jr1yry937knvkrn448rkilwfl7w90169lm5vnp53ds6fhh7bj"; depends=[data_table ggplot2]; };
@@ -11035,30 +11042,30 @@ in with self; {
   openVA = derive2 { name="openVA"; version="1.0.8"; sha256="17nqh43gmhlb383ack1pbjkdfdb2g0k527zprdp1xkyxbp92v7xa"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 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.7-0"; sha256="1h2hyk93xvcw3i86k1kw7w9y2s39l6xnj7hjqp3wawgm4nnsr5kp"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; };
-  openblender = derive2 { name="openblender"; version="0.3.2"; sha256="1mjmphmhbrxvz6szaphmfbdjp491z7fq18dbmd3v4v216ypfw2d9"; depends=[httr jsonlite xml2]; };
+  openblender = derive2 { name="openblender"; version="0.3.4"; sha256="0lf6gm1kzslqkrps2wasavfqwaz80q67jjrzf38m1dls0nwzvh1x"; depends=[httr jsonlite xml2]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
   opencastR = derive2 { name="opencastR"; version="0.1.2"; sha256="0fnp4bsr35knff7q19jqmlwdnfh9qzk2zsvg92y3pg1g64fmxazv"; depends=[httr jsonlite]; };
-  opencpu = derive2 { name="opencpu"; version="2.1.4"; sha256="06jsymwgckgnzp49brnxb5d250kybzxggy99wlkhlfgnchdisgkh"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; };
+  opencpu = derive2 { name="opencpu"; version="2.1.5"; sha256="1s2jzssiqcf4n6zqb1hj78zpm6rh13r6vbk0drydc6iwqdhg302h"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; };
   opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; };
   opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.1"; sha256="1rabbpq1jmihrm5wz8i5pkxfhpbm8x6dk3bqj56fnkzqkmg6zwjj"; depends=[ckanr geojsonsf magrittr readxl sf tibble xml2]; };
   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=[]; };
   openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; };
   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.3"; sha256="087zivh9xdh1kk8zci67ys0m2xq0slzwgnf0jl05yy4gsgb6nmyx"; depends=[Rcpp rlang stringi zip]; };
-  opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
+  opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.4"; sha256="15r6n3bkmiwir30v82ajzl2drhw2x2shjnwjs3ddqkczak2v4q8c"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; };
+  openxlsx = derive2 { name="openxlsx"; version="4.1.4"; sha256="1mwxldw9i9nfksx1i6h1kfs7vmsz9fgyllbsipar4vnfyqhqp8q7"; depends=[Rcpp stringi zip]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
   oppr = derive2 { name="oppr"; version="0.0.4"; sha256="1wxdrcchg8izdr4zdvq8dpgz5n2m4b5w4lavmvd3vhvjs6i6bb60"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; };
   ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
   optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
   optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
-  optCluster = derive2 { name="optCluster"; version="1.1.1"; sha256="0nb9b2lbsrl1gldy27vnqqd0z439vbvjg1h4a1rvqj01ik4xzfyn"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
+  optCluster = derive2 { name="optCluster"; version="1.2.0"; sha256="144pk0iqng5qqpq40r65hakpqllnpd184wpgf4j9za1mkwb4il45"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
   optDesignSlopeInt = derive2 { name="optDesignSlopeInt"; version="1.1"; sha256="0vpm4359rq5v231k63vgaac6iv2ybfkcpy59n86djb710b3h2qcn"; depends=[MCMCpack neldermead]; };
   optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; };
   optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; };
   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]; };
+  optextras = derive2 { name="optextras"; version="2019-12.4"; sha256="1sqkid6h13h8i8wzri26s828ycwlxlwpwxd85r8bw9h8hs1n602r"; 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.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]; };
@@ -11070,20 +11077,21 @@ in with self; {
   optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; };
   optimParallel = derive2 { name="optimParallel"; version="0.8-1"; sha256="176m425pp3jf48jip513hvbrvgjv78qzylmksqw5ks8yhylq41l9"; depends=[]; };
   optimStrat = derive2 { name="optimStrat"; version="2.0"; sha256="0n9igrxyasl2h2xjsx044ma3nqbd8258psc2h6za2pw6jjwwlz4g"; depends=[cubature mvtnorm shiny]; };
+  optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; };
   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]; };
-  optimos_prime = derive2 { name="optimos.prime"; version="0.1.0"; sha256="0y2i5phpb0w35mzpvd9llxar5naq4c0cqkacwz8wy5mkgxw2hff4"; depends=[ggplot2 plotly tidyverse]; };
-  optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; };
+  optimos_prime = derive2 { name="optimos.prime"; version="0.1.1"; sha256="0r7xjx86m4bklqss7h4cfsw69q74z4z6y40vfrbd6j3qz9ay66xg"; depends=[ggplot2 plotly tidyverse]; };
+  optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; 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="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; };
   optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; };
-  optionstrat = derive2 { name="optionstrat"; version="1.4.0"; sha256="0mb3hsr5dxlam1a8zi337jgg0qcvhaxa84qdni0q4b4500r2yy7w"; depends=[]; };
+  optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
-  optmatch = derive2 { name="optmatch"; version="0.9-12"; sha256="099135433855259n1ci5vzcr5v2szvrw09mcdb8vn1hmv9p5251v"; depends=[digest Rcpp RItools survival]; };
+  optmatch = derive2 { name="optmatch"; version="0.9-13"; sha256="1n6h6j0rk750jqxwxkbzdid1ig5xp8xpjw356xrqg02wm7x2gwzq"; depends=[digest Rcpp RItools survival]; };
   optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; };
-  optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
+  optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
   optweight = derive2 { name="optweight"; version="0.2.5"; sha256="1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2"; depends=[ggplot2 Matrix osqp]; };
@@ -11101,16 +11109,16 @@ in with self; {
   orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
   orderedLasso = derive2 { name="orderedLasso"; version="1.7.1"; sha256="1qywvvdbxjqq886i1gd1hsxx92zm7lbalm0acylabap5m2nf9q53"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
   ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; };
-  orderly = derive2 { name="orderly"; version="1.0.2"; sha256="1ak1f73bm8wifqdjiyln4jxgmpnzap7bm7kyarly4ascar82r4w2"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; };
+  orderly = derive2 { name="orderly"; version="1.0.4"; sha256="0z83aha45nhi7mym1mygp60jim8znyknmc254gd2cvmg7cmifzb7"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; };
   orders = derive2 { name="orders"; version="0.1.3"; sha256="14p0wk7y9hbhxwifr4fjp3h9dll0sin8q88an6a536d4f2045j7c"; depends=[Newdistns]; };
   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="2019.4-25"; sha256="1pvrkly4x12w32n7w1qljdwzqnlkv7rfa7rx0nz5vbiw29xas4i8"; depends=[MASS Matrix numDeriv ucminf]; };
+  ordinal = derive2 { name="ordinal"; version="2019.12-10"; sha256="09bpmjmbf4x82kgf6bm4bkncq2apdv9mk20zj4zgma2jx2vyfhbs"; depends=[MASS Matrix numDeriv ucminf]; };
   ordinalClust = derive2 { name="ordinalClust"; version="1.3.4"; sha256="0r1g23ddhsszl7a52pdw3wnwipk4pikkg7p256jxls777wcyla3f"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   ordinalCont = derive2 { name="ordinalCont"; version="2.0.1"; sha256="18li100drg54sfsp1qzxpfk7dqkdslrg6q4v7lqpysw9p7q0wpfp"; depends=[boot Deriv]; };
   ordinalForest = derive2 { name="ordinalForest"; version="2.3-1"; sha256="1yhaq6bg9npxsc9v6v9viqlwyrpdag1hy0z25h10cfygg8h1ranl"; depends=[combinat ggplot2 nnet Rcpp]; };
   ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; };
-  ordinalNet = derive2 { name="ordinalNet"; version="2.6"; sha256="0mapkhhv5bpmfxw2dhg9lrw7lj8ha7s7yhamihga2l977ja0ma34"; depends=[]; };
+  ordinalNet = derive2 { name="ordinalNet"; version="2.7"; sha256="13d7mvjfqdikd9lvdpsn3xr7yhkcqlv9ljy21qai9qna1cfd4x2q"; depends=[]; };
   ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; };
   ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; };
   ore = derive2 { name="ore"; version="1.6.3"; sha256="1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv"; depends=[]; };
@@ -11120,7 +11128,7 @@ in with self; {
   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.1"; sha256="0l700dai44qf5ly4idfcd637mllvxskwn0pjx4zdd4ijn5k3ykkq"; depends=[abind data_table future future_apply listenv]; };
+  origami = derive2 { name="origami"; version="1.0.3"; sha256="034h9dnllzllqd0pzx2if69x17gaxfjrfi4ini6gh23asr3krls3"; depends=[abind assertthat 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.8"; sha256="01fq3sas2xlp56f6s8jn5079pchszg2pbvzy8d5psxpb5jz59mwc"; depends=[knitr png rmarkdown ucminf]; };
   orloca_es = derive2 { name="orloca.es"; version="4.6"; sha256="1yfsvihm8p4ggdfam50i2xg7dy7khww5qqk6g4lry3m1icwx6vsy"; depends=[orloca]; };
@@ -11134,11 +11142,11 @@ in with self; {
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
   osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
-  osc = derive2 { name="osc"; version="1.0.4"; sha256="0vy7kvm2l7z6jm8y44vxbmzmkh1i10m0gzk754i2xk92ijjb75w2"; depends=[raster]; };
+  osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; };
   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.1.1"; sha256="0n297bhdb5klbk7a2n3lm4iicdggwmz82njsxqdfvzbq85j2s96v"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; };
+  osmdata = derive2 { name="osmdata"; version="0.1.2"; sha256="1zz3ba2f74fllpg5ggbhyixzdkrz4kxmk74ml717kjh49kj3wl4j"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; };
   osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; };
@@ -11151,12 +11159,13 @@ in with self; {
   otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist reshape2 vegan]; };
   otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
   ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; };
+  outForest = derive2 { name="outForest"; version="0.1.0"; sha256="0wkji836xrf7izx3ibrf1ylcm4ph766ih3qd7wqjsjfx2cz5bpjr"; depends=[FNN missRanger ranger]; };
   outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; };
   outbreaker2 = derive2 { name="outbreaker2"; version="1.1.0"; sha256="0ijyrlbg9xg2p7zr1klyd450ffiddp4fa7arxlhdjf7lsxhbl0h9"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
   outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; };
   outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
-  outliertree = derive2 { name="outliertree"; version="1.0.4"; sha256="1x5b3dz7vyyfskgxrsmjmzhkrj8y81621kilj649wgm89bm95vkr"; depends=[Rcereal Rcpp]; };
+  outliertree = derive2 { name="outliertree"; version="1.1.3"; sha256="07spgpvw665f53ifcsxgdq5q8wm4fsvjmqf7qsbwknlvly06cmcn"; depends=[Rcereal Rcpp]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
   ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; };
   overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; };
@@ -11164,11 +11173,11 @@ in with self; {
   overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; };
   overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; };
   owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; };
-  owmr = derive2 { name="owmr"; version="0.8.1"; sha256="11krzrkr1ga41nv9c2fb8cb2mgy3ias7qx85d4cdv4k68lsksv18"; depends=[httr jsonlite magrittr plyr tibble tidyr]; };
+  owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; };
   ows4R = derive2 { name="ows4R"; version="0.1-4"; sha256="1chvb7i9a6kalnjacfvwrnp5j0fhr6da6v6llazqarij9njxfing"; 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=[]; };
-  ozmaps = derive2 { name="ozmaps"; version="0.2.0"; sha256="1g2kilj9m733d7mmcpslrpaahx2zbndiq8v3g37pjr08rbq7gr48"; depends=[oz tibble]; };
+  ozmaps = derive2 { name="ozmaps"; version="0.3.0"; sha256="0f6is4kn24wl2rxs5826zv3w0nl8fnbxrxdlxb3larlprbkln5y8"; depends=[oz tibble]; };
   p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
   p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; };
   pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; };
@@ -11181,7 +11190,7 @@ in with self; {
   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.15.3"; sha256="1jx8af9p6sxbypqvj1cci7q9sbyaw310inbjxibjcr3acj59h45h"; depends=[plyr Rcpp]; };
+  pROC = derive2 { name="pROC"; version="1.16.1"; sha256="0qkp1byl2xspxaaf0by6mvvrhg7wlz6fxmynz2hkh0ds24w7ig9m"; depends=[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]; };
@@ -11191,6 +11200,7 @@ in with self; {
   packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; };
   packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.6"; sha256="0dnj99f8gl5qwn7xjg5jm7hj2ywdmmixbl2ak429ygilf8hlxzwd"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; };
   packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
+  packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; };
   packageRank = derive2 { name="packageRank"; version="0.3.0"; sha256="1617xah0c8rnyjq09k69yrmalfryx921fflpx7k7bk52zwrrblc9"; depends=[cranlogs data_table ggplot2 memoise RCurl rversions]; };
   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.1.5"; sha256="11dv9684370jnk4lsyqnqcqngrix3fwjhlhgsar6m01vvhy9w1c0"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; };
@@ -11204,7 +11214,7 @@ in with self; {
   padr = derive2 { name="padr"; version="0.5.0"; sha256="1lckaizlffgdzs7rhlkafam2clqkn3130r4fdnanm2bvd6b0z220"; depends=[dplyr lubridate Rcpp rlang]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
-  pagedown = derive2 { name="pagedown"; version="0.6"; sha256="0iri0mlxazkrphq45cynap0k4pnqfvl49slb4pyx5skfyyli0gvd"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
+  pagedown = derive2 { name="pagedown"; version="0.7"; sha256="1qvi327y6mll8ig1gnvbvyq4m9apw7ayh6i9bjzrwds0x8s4f3bp"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; };
   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=[]; };
@@ -11214,24 +11224,24 @@ in with self; {
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
   pairwise = derive2 { name="pairwise"; version="0.4.4-5.1"; sha256="0j15qbpym0y9ipc4l3z95f0bzc0pgzayspyqv81p7xakksnj2y02"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; };
-  pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.1.2"; sha256="0ak58v4675xhnskmjiin069gvq0sylfcv11f38mbl5c7iiai66bk"; depends=[broomExtra crayon dplyr forcats groupedstats jmv purrr rlang stringr tibble tidyr WRS2]; };
+  pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.1.3"; sha256="1m36zm49alsw871lh0can5c6hjsdpb23vchh8srg0rgd2zxnaw5q"; depends=[broomExtra dplyr forcats jmv purrr rlang stringr tibble tidyr WRS2]; };
   pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; };
   palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; };
   palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
   paleoTS = derive2 { name="paleoTS"; version="0.5.2"; sha256="1hd143xw16n8xhicfr6nfyfm6kyr56gyiq5vqnfzhmndjrvkpkx7"; depends=[doParallel foreach iterators mnormt]; };
   paleobioDB = derive2 { name="paleobioDB"; version="0.6.0"; sha256="00bx59gv59hsdlg5x7n6n68av0m4brw2d02caifzgy79cfln5rha"; depends=[gtools maps plyr raster RCurl rjson scales]; };
-  paleofire = derive2 { name="paleofire"; version="1.2.3"; sha256="0psmkcfyr71dzb0ja0ir5ppy74dw2gladhisammsn4cb1zsarpl8"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
+  paleofire = derive2 { name="paleofire"; version="1.2.4"; sha256="1vgai4my6kl0fldghp6a1qr8xhxiyw137kd80d0zir6q47nlnc2x"; 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.3.0"; sha256="146zcfh16y1cihn0g3rxg6mbahlld0k8cfmd3hjhnafmilib1xpq"; depends=[ape jsonlite phangorn phytools png RCurl]; };
-  paletteer = derive2 { name="paletteer"; version="0.2.1"; sha256="08wpx40jv2lqydbfj0inlmfaxwlwm93hc58996mkj2chqcncrih5"; depends=[gameofthrones ggthemes harrypotter jcolors oompaBase palr pals rlang scico viridisLite]; };
+  paleotree = derive2 { name="paleotree"; version="3.3.25"; sha256="04l7mh198sm1j8b75ydm7sq55l3nnwns29wj8cli4n3m009bjr5a"; depends=[ape jsonlite phangorn phytools png RCurl]; };
+  paletteer = derive2 { name="paletteer"; version="1.0.0"; sha256="02r7d78pvbw0xyghvngacqn0sg2zh8g8qldi8ix7khvxgh03xlvy"; depends=[gameofthrones ggthemes glue harrypotter jcolors oompaBase palr pals prismatic rematch2 rlang rstudioapi scico viridisLite]; };
   palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; };
   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.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; };
   palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; };
   palr = derive2 { name="palr"; version="0.1.0"; sha256="1v0bajsnzqamx9y275qhvzp56vzzs3hyp4mr5ijqynqj4376fqys"; depends=[]; };
-  pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; depends=[colorspace dichromat mapproj maps rgl]; };
+  pals = derive2 { name="pals"; version="1.6"; sha256="18bl15figc9mhlvxz71da6s2mzyja6rdb2cpm6h5vya1lpv3snmk"; depends=[colorspace dichromat mapproj maps]; };
   pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; };
   pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
   pammtools = derive2 { name="pammtools"; version="0.1.14"; sha256="1zr8n6j9220qv3a2q309n1ckjd4b6l2k24kfx3p4wibam8g9pqbc"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; };
@@ -11261,8 +11271,8 @@ in with self; {
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
   paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; };
-  parameters = derive2 { name="parameters"; version="0.3.0"; sha256="0ifb9g1h8sn661q7jf9d8glk58gxdcym5ywbmx7phwn0y3is5wdv"; depends=[bayestestR insight]; };
-  paramhetero = derive2 { name="paramhetero"; version="0.1.0"; sha256="16ydhp401f1iqh2b8gdi100j5dncb7khb8c6f81dak4hhs8lv4if"; depends=[ggplot2 ggpubr]; };
+  parameters = derive2 { name="parameters"; version="0.4.1"; sha256="0xkdn1079sr6kgyhc1zmn9imca4bghnxs3f91h0z7vkzjj73qdbi"; depends=[bayestestR insight]; };
+  paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; };
   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]; };
@@ -11272,8 +11282,8 @@ in with self; {
   parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
   parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; };
-  parglm = derive2 { name="parglm"; version="0.1.3"; sha256="1d6s2fjggx5mkcvqb40k5vkh53j1c6v0rjdl1yqs968b547468jh"; depends=[Matrix Rcpp RcppArmadillo]; };
-  parlitools = derive2 { name="parlitools"; version="0.3.4"; sha256="1qzb8rb91x74698mj5w48ig7a7i3qvg9whpwqihkh7zxn4mpj699"; depends=[dplyr hansard mnis readr sf snakecase stringi]; };
+  parglm = derive2 { name="parglm"; version="0.1.4"; sha256="15xwij5nq95dykmg4i356fm8pf4ml8vxcphwnr14371bk3l026vl"; depends=[Matrix Rcpp RcppArmadillo]; };
+  parlitools = derive2 { name="parlitools"; version="0.4.1"; sha256="05xii25acmbdbhrkwgw812352vhxqpp5m8qbl346bp6v74ixi8aj"; depends=[dplyr hansard mnis readr sf snakecase stringi]; };
   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.1.0"; sha256="0d3614q76dw3f7y9p8378hdny7bz5fymma5l0zpygr1cfnacdhh6"; depends=[fitdistrplus flexsurv ggplot2]; };
@@ -11281,13 +11291,13 @@ in with self; {
   parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
   parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; };
-  parsnip = derive2 { name="parsnip"; version="0.0.4"; sha256="08q4qq8akfp3ni4l380gan6r04c8ql41wpn1brciwcr4nva5ckjx"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; };
+  parsnip = derive2 { name="parsnip"; version="0.0.5"; sha256="1y3bkxkk1ib5p6zzz5js28n761rmxgws3rl1ravq37vk0h16bhg1"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
   partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; };
   partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
   particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; };
-  partition = derive2 { name="partition"; version="0.1.0"; sha256="1717cl7dz2zh4zx143qblb519yixhbr9l2x3hg0vaa4ddy6v02wx"; depends=[crayon dplyr forcats ggplot2 infotheo magrittr MASS pillar purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; };
+  partition = derive2 { name="partition"; version="0.1.1"; sha256="16hgyd30cv3n9a4qnln6ix8a912gcxr43b869xwp9786pz2g3mix"; depends=[crayon dplyr forcats ggplot2 infotheo magrittr MASS pillar purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; };
   partitionBEFsp = derive2 { name="partitionBEFsp"; version="1.0"; sha256="0rirqk9v5jbjs2jpjjkg7kvay9f093q2gwx5fx3bm9b0f5869w1b"; depends=[]; };
   partitionComparison = derive2 { name="partitionComparison"; version="0.2.5"; sha256="0wzg2r4c61fd3cp8kwsc313gwcizh5aavw361lc9gqn57p1kml1j"; depends=[lpSolve Rdpack]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
@@ -11300,7 +11310,7 @@ in with self; {
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
-  passt = derive2 { name="passt"; version="0.1.0"; sha256="1znf911l1flk8yw2kwbf9kvq5b8hrxangsb1fff4fx5g0bvjb2rb"; depends=[dplyr magrittr rlang tidyr]; };
+  passt = derive2 { name="passt"; version="0.1.1"; sha256="03ymx1bvbz2qwlkxb5iis6k3d3d5fivhcz1w23fwqhgq976zrdj2"; depends=[dplyr magrittr rlang tidyr]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; };
   pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; };
@@ -11311,7 +11321,7 @@ in with self; {
   patchwork = derive2 { name="patchwork"; version="1.0.0"; sha256="0qrwbcswh7ylrmghi17k6wk7w51cz6mcmvcyyd41hy3m2ywmkywb"; depends=[ggplot2 gtable]; };
   patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; };
-  pathfindR = derive2 { name="pathfindR"; version="1.4.1"; sha256="1m4hrchhmy9qjkilz520az7h2ga5552kqx64cl4c31pw7zy4p1vx"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph igraph KEGGgraph KEGGREST knitr magick org_Hs_eg_db R_utils rmarkdown]; };
+  pathfindR = derive2 { name="pathfindR"; version="1.4.2"; sha256="0vzzz36ih57s04izc54iznrs2k11mvj7fwwjgq54vlhv47j3c157"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph igraph KEGGgraph KEGGREST knitr magick org_Hs_eg_db R_utils rmarkdown]; };
   pathlibr = derive2 { name="pathlibr"; version="0.1.0"; sha256="0z8iz765fi1s2770p7dwwv2anihfw86kb5dwg081wb6474wiq6v8"; depends=[glue logging magrittr purrr R6 rlang]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
   pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
@@ -11320,32 +11330,29 @@ in with self; {
   patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; };
   patternplot = derive2 { name="patternplot"; version="0.3.2"; sha256="0bzy1fq9za1251h8iiixyq397wnw9k3s59i3wi2pyjca2dydhr9a"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; };
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
-  pavo = derive2 { name="pavo"; version="2.2.0"; sha256="0bbmgjc63i6vx0grs97y6jg9q44vnjhik93zzkagq532mnggjiqv"; depends=[cluster geometry magick pbmcapply plot3D rcdd sp viridisLite]; };
+  pavo = derive2 { name="pavo"; version="2.3.0"; sha256="0ix4jaqzzz5gqazhm4wmjkwyhk9xkgmwlabns1lyixl57l22p6s7"; depends=[cluster geometry magick pbmcapply plot3D sp viridisLite]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
-  paws = derive2 { name="paws"; version="0.1.5"; sha256="1a65az7al3vn2gxbki20zbjjvk8qyblhn720x9pgkhj822nmmvc0"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; };
-  paws_analytics = derive2 { name="paws.analytics"; version="0.1.5"; sha256="1k4s1qd8zy852a7ggns5kzj4sdhp1jabhy34kx37py0ahl2g9zd8"; depends=[paws_common]; };
-  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.5"; sha256="10d4fmr1savpk39yd2y7k6d4pbhy0cpq97mkgqz12iing7fdg3ml"; depends=[paws_common]; };
-  paws_common = derive2 { name="paws.common"; version="0.2.4"; sha256="1hzxazh3qmizm2fk38lrkc8dxkaaq2hkys4nbp1amizjxq6gga99"; depends=[base64enc digest httr ini jsonlite xml2]; };
-  paws_compute = derive2 { name="paws.compute"; version="0.1.5"; sha256="03p2j7isp0p4k4jagayqbylcja3f5z26js9m9dg190azgbplpl9p"; depends=[paws_common]; };
-  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.5"; sha256="0clddz1b7ndznwdhs6nb4bi5s71jb4zyp8bk8jh91hw44g0p29bp"; depends=[paws_common]; };
-  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.5"; sha256="054bvpqyhp6j3b857ra65p6yxsq2wncfiwgw1vxpw1c5j858yvbf"; depends=[paws_common]; };
-  paws_database = derive2 { name="paws.database"; version="0.1.5"; sha256="1mfvvkncqs6fb28x375g3vs4ygk2dcgzbhj0hn8x1mkv0gk7wdx5"; depends=[paws_common]; };
-  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.5"; sha256="02kq69nsd8nba48x9c0gzprw727glam22dpp094c7c91y92677np"; depends=[paws_common]; };
-  paws_management = derive2 { name="paws.management"; version="0.1.5"; sha256="0mmzmzg00gg1g2sm6jcp30rxwch36gvd4hrism77g7dbp8s9kgvf"; depends=[paws_common]; };
-  paws_networking = derive2 { name="paws.networking"; version="0.1.5"; sha256="08v9wlkziv7vabygfpzm8m8k7qn9n5w06i7i2d3qpsnxmqpvrwhs"; depends=[paws_common]; };
-  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.5"; sha256="0h3xi543sacl9iw7r7g431sbp48gynk7wbrsdb4y0z5250hgsjjr"; depends=[paws_common]; };
-  paws_storage = derive2 { name="paws.storage"; version="0.1.5"; sha256="1nvyxlvcwaki4s3gr8sphvpahvfvzysq7n8f9dsa8c7hfa6kcfyh"; depends=[paws_common]; };
+  paws = derive2 { name="paws"; version="0.1.6"; sha256="1d47i4bjqd1dam98w7wyy3zbqmjb4gaplybzir9sl3k0fwr0sk1n"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; };
+  paws_analytics = derive2 { name="paws.analytics"; version="0.1.6"; sha256="1wyc8br5vv8cp4axy9vi0asbk9fw3w7nbw5lgwrakz1zs29rhrcy"; depends=[paws_common]; };
+  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.6"; sha256="11dyi8pir23zh18z4w516gkgpddx6pz9zzlcrsh6nik0389zrrid"; depends=[paws_common]; };
+  paws_common = derive2 { name="paws.common"; version="0.2.5"; sha256="12rjhxqqypckjiiiic1474kbvf0hiv38wz3gj9z8c0wks7sp94ck"; depends=[base64enc digest httr ini jsonlite xml2]; };
+  paws_compute = derive2 { name="paws.compute"; version="0.1.6"; sha256="0ls2d25c9w5hn0h2cw0an06x3fhiff0dnxipws81rxi9vnplqb8g"; depends=[paws_common]; };
+  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.6"; sha256="1fwp4v32hkvzjks79ri5732am09dm4mh42iwg5lk5dl16im6xj13"; depends=[paws_common]; };
+  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.6"; sha256="1xsprrm7k7hakhvisfm6j29j9any1rc73cs3ilfcjfqqdf54jkpw"; depends=[paws_common]; };
+  paws_database = derive2 { name="paws.database"; version="0.1.6"; sha256="16nr5fg0q2afhzji0b74pgarhhhbqjipd200hsv9plfhwl4s3ylc"; depends=[paws_common]; };
+  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.6"; sha256="194vwvafhixn1hw3z3gpcimf2d2a978037xwl81wbpyzjrzmk3w2"; depends=[paws_common]; };
+  paws_management = derive2 { name="paws.management"; version="0.1.6"; sha256="1jazj6fj2akkk4dldcdbp24phy5pi32gv367jjsl9x9z85jfbvj2"; depends=[paws_common]; };
+  paws_networking = derive2 { name="paws.networking"; version="0.1.6"; sha256="1jbn3y0qkzyiw2bnz14rys3z2l88hailnpbsyd4k83azfy9s5vx5"; depends=[paws_common]; };
+  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.6"; sha256="1lgidvngdjkpniwzydk3xxr9aqjqrpgjc8s9f6am5llxg7jx5g9m"; depends=[paws_common]; };
+  paws_storage = derive2 { name="paws.storage"; version="0.1.6"; sha256="15y1qkzfyyqjqzyh68s17n7qavaq08js8vmx64c93zdlj11y6hag"; depends=[paws_common]; };
   pbapply = derive2 { name="pbapply"; version="1.4-2"; sha256="1xmk4p006v8gij26rs6kp5prjyf2n32nqjxiyp8a6kvgyc4z46dc"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; };
-  pbdBASE = derive2 { name="pbdBASE"; version="0.5-0"; sha256="11jlfr0pswldd5h06swfrc8bm785dv09iqgg3kfnc53yvrs0d7qv"; depends=[pbdMPI pbdSLAP]; };
-  pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
-  pbdDMAT = derive2 { name="pbdDMAT"; version="0.5-1"; sha256="0vg362f3wj5bmla5h85lqy5vs3q0sffcxbmbs9s0m378ahjcjqh3"; depends=[pbdBASE pbdMPI]; };
-  pbdMPI = derive2 { name="pbdMPI"; version="0.4-1"; sha256="1f7pjv0nqwnw74jb8hkds4as6w302mjncwjrv6jbbr81i0szncms"; depends=[float rlecuyer]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.4-2"; sha256="1lbm0a2hm2pxfm1fws4bsh4xk986q9zlqhs1qcdr46m74l3lrq2m"; depends=[float rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; };
   pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; };
-  pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-6"; sha256="0165v210pyc0mh3pp6d32jg6g2zyjajgams83g03yhqmz73kd6dj"; depends=[pbdMPI rlecuyer]; };
+  pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-8"; sha256="0xwg3yr6125iyhq80qjh3vjs2akxnfgh66h372dsniv89x8qaaaz"; depends=[pbdMPI rlecuyer]; };
   pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
@@ -11354,12 +11361,12 @@ in with self; {
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pbv = derive2 { name="pbv"; version="0.3-19"; sha256="18cypzbyamafq942bwp3k0ml3crwcpxa6rdck8657kkc22lq05g5"; depends=[Rcpp RcppArmadillo]; };
-  pcFactorStan = derive2 { name="pcFactorStan"; version="1.2.0"; sha256="15nq45p9bsmb649gp39pkq77ryzf6bcpmr70c6ijq2dda73f6265"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
+  pcFactorStan = derive2 { name="pcFactorStan"; version="1.3.0"; sha256="1jifdqf9zip16i2sycn05123hmf19rhq2wrdfixfd2rfcbjwcaab"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; };
   pcLasso = derive2 { name="pcLasso"; version="1.1"; sha256="1wdwin6xszysydspxjb8b6r3y416ri3zndh0s142b2487lhmqkb6"; depends=[svd]; };
-  pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
+  pca3d = derive2 { name="pca3d"; version="0.10.1"; sha256="1fz7p95hhvgzlh1vxlifyzbqccv4rsm7yldzca5p0dwm4rgsdkd4"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
-  pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; };
+  pcaL1 = derive2 { name="pcaL1"; version="1.5.3"; sha256="1pf1vsprng83yd4j0rhx4fvj54fr2ra4wng61bw9npzmnshkymwk"; depends=[]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; };
   pcadapt = derive2 { name="pcadapt"; version="4.1.0"; sha256="0631qx37ffz21bgwvjq2y5xn4dvz6kpmwg3rlmkxa93kwsx2b7rb"; depends=[data_table ggplot2 magrittr mmapcharr plotly Rcpp rmio robust RSpectra vcfR]; };
   pcalg = derive2 { name="pcalg"; version="2.6-8"; sha256="1pp7y0v3li8y5q599cz10ws6nql4xqdmgxfjp69h1dmc5635kr06"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
@@ -11378,8 +11385,9 @@ in with self; {
   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=[]; };
   pct = derive2 { name="pct"; version="0.2.7"; sha256="1bpmfrdidnz1aqg8llz00rrvk70f7gy2jdb0i8l3kvf8gg3ws3qb"; depends=[boot readr sf stplanr]; };
+  pcts = derive2 { name="pcts"; version="0.14-3"; sha256="16ldn685ninrnn095wnckfki12jicwj15m9806a0dw1g51qy1699"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; };
   pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
-  pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.3"; sha256="0kqph8134g1fyzc9b06nighkqsh6jjpckvwxhpslihj5sj3kapdd"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; };
+  pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pder = derive2 { name="pder"; version="1.0-1"; sha256="147fc5swmh0qrg7k3q3gpnvl9f7hhjjzwi8f5dc4fkyj14qi5bm5"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; };
@@ -11390,7 +11398,7 @@ in with self; {
   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.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
-  pdqr = derive2 { name="pdqr"; version="0.2.0"; sha256="1wcsdx0nns5vb0gksmykhyrn0y00x9b8m4d05dxllyvx9xika1n5"; depends=[]; };
+  pdqr = derive2 { name="pdqr"; version="0.2.1"; sha256="1444r51lh66kmhvkp8ivr95zlnxfgv28whl0axwb56hf5vi44lp9"; depends=[]; };
   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]; };
   peRspective = derive2 { name="peRspective"; version="0.1.0"; sha256="1zz3znzaa80k60jddys5fhxwx4c8lyqymx5fw2zvj654rnk0mmzc"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; };
@@ -11400,7 +11408,6 @@ in with self; {
   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="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; 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="3.2"; sha256="1cl95fw6wdh4k6rg1nlydh09gf96pcgyfd3bxdcaisq0vfn05g0j"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
   pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; };
@@ -11414,7 +11421,7 @@ in with self; {
   pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
-  penPHcure = derive2 { name="penPHcure"; version="1.0.1"; sha256="0d5sz5027dvjgp4zc9qjlidplldpq4y18rfiq2wxxcrba7xp8yvp"; depends=[MASS Rcpp RcppArmadillo Rdpack survival]; };
+  penPHcure = derive2 { name="penPHcure"; version="1.0.2"; sha256="1c90d6f78npvzsvcy9vh8s6izfgbcxzly37lpwhqgdl5daww03l1"; depends=[MASS Rcpp RcppArmadillo Rdpack 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.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
@@ -11429,19 +11436,19 @@ 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.3"; sha256="0x895b75fjipzv7ff9mz7qpcabm9zys3bjsalk6h2q2350lwjmq1"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; };
-  perfectphyloR = derive2 { name="perfectphyloR"; version="0.1.3"; sha256="05awwlsams9qc75hxl362scjsfz65kd250a5a545yniljr6wm6zl"; depends=[ape dendextend HHG phytools Rcpp RcppArmadillo]; };
-  performance = derive2 { name="performance"; version="0.4.0"; sha256="0lxpmp9smn5r3xvfik36nr608wcpmmximjh0v2sckyvjf7hnb4s0"; depends=[bayestestR insight]; };
+  perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; };
+  perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.0"; sha256="00gvmn66lb9hfli7yc3l5913xpngib1vksg5zjnxqxiwdibjfqx8"; depends=[ape phytools Rcpp RcppArmadillo]; };
+  performance = derive2 { name="performance"; version="0.4.2"; sha256="1pcjmqqm178dvdcpzkv5p4sj7glsppcny7znljb2nqkxh539a59p"; depends=[bayestestR insight]; };
   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]; };
-  periscope = derive2 { name="periscope"; version="0.4.6"; sha256="0544b525nbq26sr5zwxgvcw9mpg6v4qgbzjjji5xirzfj0ra1v1h"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; };
+  periscope = derive2 { name="periscope"; version="0.4.7"; sha256="1kzk8vp7w3ki4z9arhf340hkbh44jzwf5p2lzyy5wx6z92s4lv5d"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; };
   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.2"; sha256="0np10qhj5rl2gjmq5sfnpaqymmr0wag2b8fwyzndjflvypfmcsyp"; depends=[ggplot2]; };
-  permuco = derive2 { name="permuco"; version="1.0.2"; sha256="0mms11j2x3rw7c9pq2pb2wvcvx0a14p20clysa2b081xgmzx3971"; depends=[Matrix permute]; };
+  permubiome = derive2 { name="permubiome"; version="1.3"; sha256="0x5c9yf9xl14p1dxbhdggw75pnp0pzvm6bdigfpmhkq9qamdyscf"; depends=[dabestr ggplot2 gridExtra Matrix]; };
+  permuco = derive2 { name="permuco"; version="1.1.0"; sha256="1mp3yp4p1b382c31a3jcmq1n90zvb1lggacb3zdblpmz1yrj4v1c"; depends=[Matrix permute]; };
   permutations = derive2 { name="permutations"; version="1.0-5"; sha256="0891yqrj45fn11762d4an3bri8ihlxf0102z06mbfdy4hf8582h0"; depends=[magic numbers partitions]; };
   permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; };
   permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; };
@@ -11464,10 +11471,10 @@ in with self; {
   pgdraw = derive2 { name="pgdraw"; version="1.1"; sha256="1s1b1izpgryrqsjkdh3yvr137054sipj3kwdkzlx2af8xjr53f85"; 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.3"; sha256="0bzjhq8552v1pdbxkq4409vavim3hy9hb7dk7sch66ykj5cys3s5"; depends=[]; };
+  pglm = derive2 { name="pglm"; version="0.2-2"; sha256="0n0wkc5fn9g3jgx070l23dv7ir2k8kz1302q0dawx4pzr4wdwrq0"; depends=[Formula maxLik plm statmod]; };
+  pgmm = derive2 { name="pgmm"; version="1.2.4"; sha256="1bpknwfzw6rmag5s7ajg1glx46wkby5ahyya76ksa7r8vz4ffs3z"; depends=[]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
-  pgraph = derive2 { name="pgraph"; version="1.5"; sha256="0rdgz1rwrmjwkk4238pbq2kbvflajx7d1gxr7mfa574kcs5zw9zm"; depends=[energy glasso glmnet SAM]; };
+  pgraph = derive2 { name="pgraph"; version="1.6"; sha256="1mfpyj4ahs5szkzzv5fs9g26651vcnign3mkfgp23g8nlrs50cqa"; 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]; };
@@ -11478,11 +11485,12 @@ in with self; {
   phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.1"; sha256="1gg11rvs5zqza66f7r7sw7g3w8nzi3il1883wpwzqhp58hsphjdw"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS phase1RMD plyr RColorBrewer reshape2 rjags]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="2.1.3"; sha256="1xqh6k8zl0jc2srklb8vg57f88kssm80b286asg2cawanj06qs2k"; depends=[deSolve]; };
-  phateR = derive2 { name="phateR"; version="0.4.1"; sha256="13vqrxbshk62wk4myhwyp4a7k6i9synknvmfah3l1pg2b3b3dqmj"; depends=[ggplot2 Matrix reticulate]; };
+  phateR = derive2 { name="phateR"; version="1.0.0"; sha256="1xfbzqhly569i4ic2gv4vn4sqnyqzhgqil17z1133sx78r4yj83a"; depends=[ggplot2 Matrix reticulate]; };
   phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; };
   pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; };
   phenModel = derive2 { name="phenModel"; version="1.0"; sha256="07jsc8jiwgxvhv4m6nr7llm22zzh5hd3pakw5c93jzim2835zvkp"; depends=[dplyr ggplot2 reshape]; };
   phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
+  phenesse = derive2 { name="phenesse"; version="0.1.0"; sha256="0f9fwa0x7wmgkwmqx5afffhv1c5x6p67kpb9pki85x8b7nd1gqgl"; depends=[boot fitdistrplus]; };
   phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; };
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
@@ -11496,16 +11504,15 @@ in with self; {
   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=[]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
-  philentropy = derive2 { name="philentropy"; version="0.3.0"; sha256="0gc8xsvfswjs0izl4axy35w8cbsyrci8n97z6i0jbzmjci2gf7ii"; depends=[dplyr KernSmooth Rcpp]; };
-  phmm = derive2 { name="phmm"; version="0.7-11"; sha256="0yr0mc2nk71mwmgc12mbjvdkxxwzaj5c77af539yz9h9zswic6ys"; depends=[lattice Matrix survival]; };
+  philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; };
   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=[]; };
-  phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.2"; sha256="1flpk6d6q3fh5b855wk0v9gl7m810qjkv10papg1r9iflb9k41rp"; depends=[DT phonTools rmarkdown tuneR]; };
+  phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.3"; sha256="1d7rhyzdhm17hdd7ibvkgz3js01c7wskvxlhr1c6kzbvf0mibmb6"; depends=[phonTools rmarkdown tuneR]; };
   phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.29"; sha256="1ins3554jydgvisg08ngp7f7h98hxihnkj8kwnk65xyiziy11g09"; depends=[dplyr lubridate plyr polynom rlang splus2R tibble zoo]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.30"; sha256="0q15x9lgz0mvqnykg36iryz7nb0c92mz6zqyy56cypc6wwakym2i"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; };
-  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.21"; sha256="1h24bwmjchhhicxiyfylm65bl12dakn0b4q0zpgk6xlxk13n7fbb"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; };
+  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.21-1"; sha256="1n9vhxp4qvwqnqqpbkd8iz4pfl4x81kjyxm7fj9yzyjvdjfiq0sq"; depends=[colorSpec dplyr 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.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; };
@@ -11519,22 +11526,21 @@ in with self; {
   phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
   phuse = derive2 { name="phuse"; version="0.2.0"; sha256="0zbkh7j3i87c77k9z959gq676qn3aqnsx8lvm7jg99yl9p7i5znm"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; };
   phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; };
-  phyclust = derive2 { name="phyclust"; version="0.1-27"; sha256="0pcid1vf3cb9ly0kx2a5jgdlns5chx51zkgnfj33z30h50fs2n02"; depends=[ape]; };
+  phyclust = derive2 { name="phyclust"; version="0.1-28"; sha256="0y6f4d4mnpgk841knbhaf73khbakjphim9x4sqrczgsrsjas596f"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
-  phylin = derive2 { name="phylin"; version="2.0.1"; sha256="0gmvr9zcaxb49gfjg3bq0izmw18hhganv1hnzjg257ar2xr5hbgn"; depends=[]; };
+  phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; depends=[]; };
   phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; };
   phylobase = derive2 { name="phylobase"; version="0.8.6"; sha256="1n9g69llrh8xfmrnxh78rr09cxy5qbc99dr3amg121pl1qhpn4g7"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; };
-  phylocomr = derive2 { name="phylocomr"; version="0.3.0"; sha256="0w02r7nwnal22gqrs53fbmhbzs10237yghhmm20fh6va0cfh1j36"; depends=[sys tibble]; };
-  phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
+  phylocomr = derive2 { name="phylocomr"; version="0.3.2"; sha256="1qdhf6a7cqp12i4macy5wcbk6mf01fqbm4rc11yl63qr72zwrbhy"; depends=[sys tibble]; };
+  phylocurve = derive2 { name="phylocurve"; version="2.0.10"; sha256="1027r5dgp2a8cci2269fbjkhx9k6lifxljkpp54yv7nynfj5izgp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
   phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   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.1.1"; sha256="02wx4hav2p81hpzyd2k589h7d56ziki7gmk16bi28c6z49pn2cfx"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; };
+  phylopath = derive2 { name="phylopath"; version="1.1.2"; sha256="15fs845ay7nbhaxwapc2b33f134nqj1m365l44iyikdm4cacmdx0"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; };
   phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
-  phylosignal = derive2 { name="phylosignal"; version="1.2.1"; sha256="10ds4vn5rw3nrgvsg2n0b53bivy54p5j7fmnqn81alzz9irgrkcs"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylosim = derive2 { name="phylosim"; version="3.0.5"; sha256="07adqgkxng0jj51nhwlsxxnd0bdxrk54lvj1fs53yxy236q6xwkf"; 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.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; };
@@ -11547,11 +11553,11 @@ in with self; {
   picante = derive2 { name="picante"; version="1.8"; sha256="1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1"; depends=[ape nlme vegan]; };
   picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; };
-  piecepackr = derive2 { name="piecepackr"; version="1.1.1"; sha256="1s5qkawjsqv0nz1ixk87nlr6sg1jxc3jf8sxfphl4bgvhkyx0f5j"; depends=[grImport2 purrr R6 stringr tibble]; };
-  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.0.2"; sha256="07vz90cghkbmcar9ps94wydvg4r7mj32pa7vjdmgm5j8dhxq8max"; depends=[car lme4 MASS nlme pbkrtest]; };
+  piecepackr = derive2 { name="piecepackr"; version="1.2.1"; sha256="1mh3b862pyxl9zkxmvcflnn4b0nx27s8fj3srs5ph2gwhh7l3zcy"; depends=[grImport2 jpeg png purrr R6 stringr tibble]; };
+  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.0"; sha256="1dpl3kyph0ry9g9321cknznjdizh03klg0s6hx56g6h8ygb0ar6h"; depends=[car DiagrammeR emmeans igraph lme4 MASS nlme]; };
   pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
   piggyback = derive2 { name="piggyback"; version="0.0.10"; sha256="08d7jxw7mvfyhjbr8zy95p952j2p94ii6zq38b8xw96g6k1380bz"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; };
-  pillar = derive2 { name="pillar"; version="1.4.2"; sha256="0988047mf0xdhdkqqmavzx4ifjhndjnxniyrrhrdq1nvnrvbpfms"; depends=[cli crayon fansi rlang utf8 vctrs]; };
+  pillar = derive2 { name="pillar"; version="1.4.3"; sha256="02sn7zw80wq33jgxk2i6m5jb83sk7y72dfhgyy0apfinv05w92ss"; depends=[cli crayon fansi rlang utf8 vctrs]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
   pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
@@ -11562,7 +11568,7 @@ in with self; {
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
   pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; };
   pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; };
-  pins = derive2 { name="pins"; version="0.3.0"; sha256="17hzp8rcif85bc4svazwhyv434aqilzm7ir019l8y7bwhsfnbilw"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; };
+  pins = derive2 { name="pins"; version="0.3.1"; sha256="187n23r099fgv6d0xsb4hjah74nni14q380lldv5y17swv0vl89r"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; };
   pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; 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=[]; };
@@ -11590,7 +11596,7 @@ in with self; {
   pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; };
   pkgnet = derive2 { name="pkgnet"; version="0.4.0"; sha256="0da139p57xvy2v5ld3mnddgak59zjr58ndnbgg3y8msni80g52gq"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; };
-  pkgsearch = derive2 { name="pkgsearch"; version="3.0.1"; sha256="0gkc8dnsfp6df8y1s09m52faz069vsv7kgpkjw1w2fw93nl1354f"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; };
+  pkgsearch = derive2 { name="pkgsearch"; version="3.0.2"; sha256="1dvlqav7hp43x30rmwr8h3dscc0hc01i6mfc7hxvf7ny1rzckfv0"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; };
   pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; };
   pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; };
   pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; };
@@ -11622,27 +11628,26 @@ in with self; {
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
-  plot_matrix = derive2 { name="plot.matrix"; version="1.2"; sha256="1d2vhqqnkr113z3rw7vcr5m8izjzz0hn2rggbr5rf23kjdbyrzjj"; depends=[]; };
-  plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; };
+  plot_matrix = derive2 { name="plot.matrix"; version="1.4"; sha256="0szrh83fc7x9kcz9caj3pwqrgrlq718v28j63j2mi2bvxbc8406l"; depends=[]; };
+  plot3D = derive2 { name="plot3D"; version="1.3"; sha256="1jfzndnlci9a975qbcv66jiy2l46hs3f2049654x4jp3i4kyrr5r"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
   plot3logit = derive2 { name="plot3logit"; version="1.0.2"; sha256="0pgqlq8rpkrv277d1mfy2z22mkykc5zmhvkg07wsz3hdxr0ifx80"; depends=[ellipse ggplot2 ggtern magrittr reshape2 Ternary]; };
   plotGMM = derive2 { name="plotGMM"; version="0.2.1"; sha256="1gp99gvb886kcwjk9yvfd7s6mgy3jf3x0zhpaj9zp0fky12ivz7b"; depends=[amerika ggplot2 wesanderson]; };
-  plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
   plotKML = derive2 { name="plotKML"; version="0.6-0"; sha256="18c2lwdlxbzlfhlf0bip825v2mfrnqd9gg30l967zv112j7x0hrf"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
   plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
   plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; };
   plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; };
   plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-  plotdap = derive2 { name="plotdap"; version="0.0.4"; sha256="1lal5vqy7s9g5wj39d5d5kw8lzpl9gvq0p2wig8s1w3m7cb2ignx"; depends=[dplyr gganimate ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr]; };
+  plotdap = derive2 { name="plotdap"; version="0.0.5"; sha256="0c0ixynfn7a0n9h78vngsy6rqsypji6ybb4iwbrm14a42q0krhy3"; depends=[cmocean dplyr gganimate ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
-  plothelper = derive2 { name="plothelper"; version="0.1.5"; sha256="1bvk45cfajcjwr4b4ajw33xk5p9hwqw833n05vxhhgrwnmsla2ag"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; };
+  plothelper = derive2 { name="plothelper"; version="0.1.6"; sha256="00bwv2ih967sg81pr8ahyc80j24i1dvcay416andg12674k6gj2w"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; };
   plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
   plotly = derive2 { name="plotly"; version="4.9.1"; sha256="0gadam4qw81q9gpjp7sqrpd7ikmcdsc78d8vjn39g0xzs5j8r845"; 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.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; };
   plotmo = derive2 { name="plotmo"; version="3.5.6"; sha256="15555b7y62sc0z3r41gb56fmc6rmj1icnanyibx22v8kjz48vw3q"; depends=[Formula 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-6"; sha256="0ijfjlr7ls5hvfyzdmwab6bx0w3nvp0c8fgynj4355cj8mbzgmc3"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.7-7"; sha256="1x92mmyfry127zzr6cmcj6kjsc4zhxrrdlr0jcxn3bb0hpdfps54"; 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=[]; };
@@ -11665,31 +11670,30 @@ in with self; {
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
-  plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
-  pm4py = derive2 { name="pm4py"; version="1.0.1"; sha256="144v0nn71rhkifghf3qws72x6gsckvdzr81kpdr97kqm1q1wxdy0"; depends=[bupaR petrinetR purrr reticulate stringr]; };
+  plyr = derive2 { name="plyr"; version="1.8.5"; sha256="0x4mbb3rgv1ayxqidw0p9i10khbg51fz5r62vw4il8d7licqq07a"; depends=[Rcpp]; };
+  pm4py = derive2 { name="pm4py"; version="1.2.7"; sha256="11xbsmsc9pxd98fy28l3nxzhb6c2pwvh1gmm34jnqn0rjbpb2n9i"; depends=[bupaR petrinetR purrr reticulate stringr]; };
   pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
-  pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
   pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; };
   pmdplyr = derive2 { name="pmdplyr"; version="0.3.0"; sha256="1gyd55h718zf3crhgkdln48jw7y7djgsdjf4j06zr3rgy5mk2sp3"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; };
-  pmml = derive2 { name="pmml"; version="2.1.0"; sha256="0vcfwc4gwc2cgf1v2008wf3mkbw77vq5dqziw13ivir49qnzjf2g"; depends=[stringr XML]; };
+  pmml = derive2 { name="pmml"; version="2.2.0"; sha256="0j2gznmjgzv9ccpgkhpkww99sa165b7jwhx3g61rvbcmg89l3i3m"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; };
   pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
   pmsampsize = derive2 { name="pmsampsize"; version="1.0.2"; sha256="1jb6vpbc3p7xpskjs7cfkird096fl1faczmp3nfawf7pnvf679jg"; depends=[]; };
   pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; };
-  pmxTools = derive2 { name="pmxTools"; version="0.1.3"; sha256="0v1q83hgql2qpkc199m1sf0kwmacda3i06lbs4ws02had3r4nv8s"; depends=[ggplot2 ggrepel gridExtra MASS stringr XML]; };
+  pmxTools = derive2 { name="pmxTools"; version="1.0"; sha256="02qv455jysnf218zsa494x1hwlsymil9p1ysdmhx26wdja6dwb6m"; depends=[chron ggplot2 ggrepel gridExtra MASS stringr XML]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
   pocrm = derive2 { name="pocrm"; version="0.12"; sha256="0ilh19vqy3lqnb4j6jw61az39swmca8za3ig3k1cjc9gwdyn1f8r"; depends=[dfcrm nnet]; };
   pogit = derive2 { name="pogit"; version="1.2.0"; sha256="1kap1cpfp0k2vm7w4kjfja37n9z3j7ppiwvsdxl6bgpkf7kcnkp2"; depends=[ggplot2 logistf plyr]; };
-  poibin = derive2 { name="poibin"; version="1.3"; sha256="0lkqxpk5f27ghjia2akzi1c51hk9p9qkw8vysa0qwkbsgasq86p3"; depends=[]; };
+  poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
-  pointblank = derive2 { name="pointblank"; version="0.2.1"; sha256="01rg3fpnvrrp1cvg472fnk1q872ncalsrig4jipnpyzkgi2y4xcq"; depends=[commonmark DBI dplyr glue htmltools httr lubridate magrittr messaging purrr readr rlang rmarkdown RMySQL RPostgreSQL stringr tibble]; };
+  pointblank = derive2 { name="pointblank"; version="0.3.0"; sha256="0r94yplk5s9ckj8xlrqzc2xb77aik18anvhg6kbprzjzmhmahhrm"; depends=[dplyr magrittr rlang tidyselect]; };
   pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; };
   pointdexter = derive2 { name="pointdexter"; version="0.1.1"; sha256="058iv9pk3byyvddbkm8g1vc7kmrkbwglbw0v2ns6w066fwiysv70"; depends=[sp splancs]; };
   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]; };
@@ -11702,7 +11706,7 @@ in with self; {
   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.1"; sha256="0mfjcjhv2prc2xdg9672z1cjxd2wp541hb7lz497cqlig2p6qgb4"; depends=[jsonlite RCurl]; };
+  policytree = derive2 { name="policytree"; version="0.9.0"; sha256="15cqmcdxk25y300z5qvhh981bmzph272sciaa40swj5jw5fz357y"; depends=[BH grf Rcpp]; };
   poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
   polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; };
   politeness = derive2 { name="politeness"; version="0.4.1"; sha256="0jb5s62qbf5904j0990iv4z1zlqmyvci4dbahkd2lzxsz51ykdq3"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
@@ -11710,9 +11714,10 @@ in with self; {
   pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; };
   pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; };
   pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.11"; sha256="0vifxnvzh2nvrykpx8y9waps1aqzplvjpxxcfy2z31lyfca646kz"; depends=[data_table DT jsonlite knitr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; };
+  polmineR = derive2 { name="polmineR"; version="0.8.0"; sha256="1j9f83b1lfb02q830zaffrspxrhp58j9l3cc80cxiflmkm9s1jm9"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; };
   polspline = derive2 { name="polspline"; version="1.1.17"; sha256="0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; };
+  polyMatrix = derive2 { name="polyMatrix"; version="0.2.4"; sha256="1z7n2ankfd9nrr7l3rm3pcm26pjss0f8wv187g9dxq4db5qx490k"; depends=[MTS polynom]; };
   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="1.1"; sha256="04rhff7yzswilx67ak56vsr4sxfjzhd3d9fihnx2mnyddf1mhamq"; depends=[fastmatch pcaMethods Rcpp]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; };
@@ -11724,14 +11729,14 @@ in with self; {
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; };
   polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; };
-  polymapR = derive2 { name="polymapR"; version="1.0.19"; sha256="11mv16ixcsi0n8hkmm8vfsdk53i7gfixmbfyzhlhndlnakw0l5hj"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
+  polymapR = derive2 { name="polymapR"; version="1.0.20"; sha256="16gyzlvj2nfyl9ypv5cmvqvn3phxpxf36b0bnvslkxyyx0fsyxrx"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
   polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
   polyreg = derive2 { name="polyreg"; version="0.6.4"; sha256="0q1zs56b59xq8g1lvqryfdkq3zwix1dhr4606dq4mbf2hsjkvkd5"; depends=[dummies nnet partools RSpectra]; };
   polysat = derive2 { name="polysat"; version="1.7-4"; sha256="08jmkik4s2171znp3w4i0v0g0k2s0di3xqwr9sf9hyd0sf8af8dp"; 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]; };
-  pomdp = derive2 { name="pomdp"; version="0.9.1-1"; sha256="16vbriv5ssb75qcp6c6gaz796wryf5b4d09vc9i3dd37gdf09d4s"; depends=[igraph]; };
+  pomdp = derive2 { name="pomdp"; version="0.9.2"; sha256="0bzppkda355zj467ahcyaf2dsjajyiznzi0y07n9pf9ccr6rh5lg"; depends=[igraph]; };
   pomp = derive2 { name="pomp"; version="2.4"; sha256="19j8aqsxx54xacw6vd3yva8jznqrycc831zs5f08x9r2q1ld6yjp"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; };
   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=[]; };
@@ -11740,22 +11745,20 @@ in with self; {
   poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; };
   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]; };
   popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
   popReconstruct = derive2 { name="popReconstruct"; version="1.0-6"; sha256="0nmf93dy2qf7z9mafpy99ry53aapbxlismn7drn732r8gvravapx"; depends=[coda]; };
   popbio = derive2 { name="popbio"; version="2.6"; sha256="1j8q4rdq8b9r56p0slwkfsknv6linjnmcprrzbck9yr99zfqp067"; depends=[]; };
   popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
-  popkin = derive2 { name="popkin"; version="1.2.2"; sha256="1dc1p791v20zq6wxc3n45g6bqpvjvhy9pn4s5v1y6sw69myxlhj3"; depends=[RColorBrewer Rcpp RcppEigen]; };
+  popkin = derive2 { name="popkin"; version="1.3.0"; sha256="1gr2glyavvf2r89zwiama3qhmq32rdzjsqkhv70afmsapk6f4dhr"; depends=[RColorBrewer Rcpp RcppEigen]; };
   poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
   poppr = derive2 { name="poppr"; version="2.8.3"; sha256="158sb5v3qmnka431fvgg84pvv1j3mbqmydry63m5yrflzsninv1z"; 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.1"; sha256="11hzsr69rjklyxkp8jbp6794a4r3cyid0k40dz8d35ca068y2vcl"; 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.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
-  porridge = derive2 { name="porridge"; version="0.0.2"; sha256="04w31avmjhb997vdzxg5mxddjgjzbhphw4a0l2xck7x374v3qqh7"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
-  portalr = derive2 { name="portalr"; version="0.2.7"; sha256="09l61ncxs0v65x43yp189yj53sl4wdrgsiiz89c4lhasjh5q64h7"; depends=[clisymbols crayon dplyr forecast httr jsonlite lubridate lunar magrittr rlang tibble tidyr usethis]; };
+  porridge = derive2 { name="porridge"; version="0.0.4"; sha256="1b43yxhqfrkz777rp6yqw4in5i22lkfnh41f05dqnns2qg5hdlyp"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
+  portalr = derive2 { name="portalr"; version="0.3.1"; sha256="0i3xg3ccccrcamk7yx3nzllf4ir1xg15d3w6byvi4yx6w25khqcn"; depends=[clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tibble tidyr usethis]; };
   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]; };
@@ -11767,10 +11770,10 @@ in with self; {
   posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; };
   postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; };
   postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
-  postlogic = derive2 { name="postlogic"; version="0.1.0"; sha256="1m4z92y9kjjgz5xh0x74i1sgsybm8gv36l25fbbcwlg1jazwgrwn"; depends=[]; };
+  postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; };
   potts = derive2 { name="potts"; version="0.5-8"; sha256="0j3c7sh50r1lqd8gl0rq7pq8j9v33wcz46gv7lm0n7y89qj6f45x"; depends=[]; };
   povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; };
-  powdR = derive2 { name="powdR"; version="1.0.0"; sha256="1pc9s7kh19ri9p7fwz3g8binab8nlcypzgmg56gn0qwpgnjvzdx1"; depends=[baseline ggplot2 ggpubr memisc nnls plotly reshape shiny shinyWidgets tidyr]; };
+  powdR = derive2 { name="powdR"; version="1.1.0"; sha256="0by1jxqpqjgpsqzgagirz7z6cgvxa5k33m15qsc4dina12hi21n8"; depends=[baseline ggplot2 ggpubr memisc nnls plotly plyr reshape shiny shinyWidgets tidyr]; };
   powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; };
   powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
@@ -11786,18 +11789,19 @@ in with self; {
   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.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; };
   ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; };
-  ppcong = derive2 { name="ppcong"; version="0.0.1"; sha256="1maf9lyb24v3q48x1zn9i25lqdsjpwl0hzsq8spljdzvjiyl84rb"; depends=[curl jsonlite tfse tibble]; };
+  ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; };
-  ppitables = derive2 { name="ppitables"; version="0.5.1"; sha256="1gc0hh2g1wmqk49cmswq9drxw8h94xpriibs76n287nmvrg6ip7d"; depends=[tibble tidyr]; };
+  ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; };
   ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; };
+  ppmHR = derive2 { name="ppmHR"; version="1.0"; sha256="1fc9rrk3ir3dq5d518ih67dvknhz1ln6668wy2mzsdndaysgm12g"; depends=[nleqslv]; };
   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.3-1"; sha256="1h5k13w8mmmdy74l145zh64f339wy78z1nlg8xr3zg23gmv98cpg"; depends=[MASS mclust]; };
-  pracma = derive2 { name="pracma"; version="2.2.5"; sha256="0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g"; depends=[]; };
+  prabclus = derive2 { name="prabclus"; version="2.3-2"; sha256="0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl"; depends=[MASS mclust]; };
+  pracma = derive2 { name="pracma"; version="2.2.9"; sha256="07mzhzz73wsjjw1q05l024gcd13hwnzsxf873q9dyhw6x3shzshc"; depends=[]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
   prais = derive2 { name="prais"; version="1.1.1"; sha256="027qsa1nc680bcs61dlyz0wwap5pgxdfzasg9ny37a55hnikxid5"; depends=[lmtest sandwich]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
@@ -11810,7 +11814,7 @@ in with self; {
   pre = derive2 { name="pre"; version="0.7.2"; sha256="156wgyv88a5qvdksfhyyim2h1igaba8gf4mgaq6ii6sxppmik4a8"; depends=[earth Formula glmnet Matrix MatrixModels 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.10.1"; sha256="008vcnbg0rl9x70ly1xzz1xn4fs7mjhnp2c0a7jxzwiri5gymh09"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
+  precrec = derive2 { name="precrec"; version="0.11"; sha256="1y0d0jqpvh0c96zi2fp7q1f25n5sm6ai2k6l54j9c3plkk1vw3lp"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
   predhy = derive2 { name="predhy"; version="0.1.0"; sha256="1m4ysryh66blqnvnskfwmjbz85pziqlii12jv9gpf2a3jnl5dvij"; depends=[]; };
   predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; };
   prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; };
@@ -11818,7 +11822,7 @@ in with self; {
   predictmeans = derive2 { name="predictmeans"; version="1.0.1"; sha256="06zspg1v0x1qqaah7xj5jdaqjv7asnzmgybyyzx3j26v4h59p350"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; };
   predictoR = derive2 { name="predictoR"; version="1.1.0"; sha256="12y23q08m7v4dl6anbkhf7zxy8wkah5bxy1c2fdcwb6ng3snpfvb"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; };
   predictrace = derive2 { name="predictrace"; version="1.0.0"; sha256="1vpamn1j1jqdjar14j7fn4gvr8wq8lpqfnrwifgl0qvpa4y1938y"; depends=[dplyr here tidyr]; };
-  predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
+  predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
   predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; };
   prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
@@ -11838,10 +11842,10 @@ in with self; {
   prettyB = derive2 { name="prettyB"; version="0.2.1"; sha256="1qpqr490bpvmj1ybjbh4lhiznqa0n3chn09m7bhn9wfm3ic56s0p"; depends=[]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.6"; sha256="0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2-3"; sha256="1rs90cmr5dyry724php90mp41qwzzk1z3gxfwcj1k157qawacyhr"; depends=[]; };
-  prettycode = derive2 { name="prettycode"; version="1.0.2"; sha256="0yz75qqpvrk4p9mypjnmrg1xwlrhh2iax2897f11cfk8rjj784jg"; depends=[crayon withr]; };
+  prettycode = derive2 { name="prettycode"; version="1.1.0"; sha256="1ifh9h73szc23p1ii77z0r68n1gghndqqdm07wd7gxsg5pppp1sg"; depends=[crayon]; };
   prettydoc = derive2 { name="prettydoc"; version="0.3.1"; sha256="02x4vf7rr4gazz6mmygynqnjs016jhjb2gg109sqrs0nwk1blcm9"; 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]; };
+  prettyunits = derive2 { name="prettyunits"; version="1.1.0"; sha256="0453vvslpkj1ysyv0cy9hw98q5wlnj7bvvz7vzl5ld8ij82lwy5c"; depends=[]; };
   prevR = derive2 { name="prevR"; version="3.4.0"; sha256="1y61ggqjf3b2a5f9zprbp9ylfkcfk0jiqfymkyqci9figsnahdy1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
   prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; };
@@ -11857,10 +11861,10 @@ in with self; {
   princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
-  prioGene = derive2 { name="prioGene"; version="0.99.0"; sha256="0ksbv1qqbq6wabykrkhiak3rmnn2x74i3j090bvwgax5a2dma5s2"; depends=[]; };
+  prioGene = derive2 { name="prioGene"; version="1.0.0"; sha256="0s4vcx5v9agzf84k45lb4ziqqhj9krf096m66m927lb6ik8gx58h"; depends=[AnnotationDbi org_Hs_eg_db]; };
   prioritizr = derive2 { name="prioritizr"; version="4.1.4"; sha256="1z8p9faacbi61sfxyqz0k7zlxyqc03gg9rc9f4a5zbdcnx83bhf3"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; };
   prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; };
-  prioritylasso = derive2 { name="prioritylasso"; version="0.2.2"; sha256="1wdnizwq0mgjqbaxp6swf3z4wkdfig390i2d8jy86lg0q7gym5af"; depends=[glmnet survival]; };
+  prioritylasso = derive2 { name="prioritylasso"; version="0.2.3"; sha256="1hmf81vcri0sfaphc0221skpvb2gz0zvxlmlhv7k8rhs1pvnqi8g"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; };
   prismatic = derive2 { name="prismatic"; version="0.2.0"; sha256="0j077khvagzs9lxrryi4q1czk1129r93cqf1i1hiz0b3wij2bwsg"; depends=[farver]; };
   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]; };
@@ -11870,14 +11874,14 @@ in with self; {
   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]; };
-  probably = derive2 { name="probably"; version="0.0.3"; sha256="0i6r7yc8s3rlkxaqc48arci4i2wyi4xygf93bisd8zfgrzcvmgw8"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; };
+  probably = derive2 { name="probably"; version="0.0.4"; sha256="15wgaah2b6pkcqwv700gvkkky6xqyj75lpgaxxmflkkqqsirssww"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; };
   probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
-  probhat = derive2 { name="probhat"; version="0.1.1"; sha256="0jq5r16isys38yb0y7sfg877l46jl8x4x0l3yjlqyipik1lczhpg"; depends=[barsurf]; };
+  probhat = derive2 { name="probhat"; version="0.2.0"; sha256="04pzvrny045p8rpvh7va55qfak0b3751x2bi3sp9hqiwr8dys02z"; depends=[barsurf intoo kubik]; };
   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=[]; };
   processR = derive2 { name="processR"; version="0.1.0"; sha256="1c36f1l9ylj01hr5fs1413kixd3jx6fdhha4rw1mpcjbn9cxnjgq"; depends=[diagram dplyr flextable ggiraphExtra ggplot2 jtools lavaan magrittr modelr mycor officer prediction psych purrr rlang rrtable semTools shiny shinyWidgets stringr TH_data tidyr tidyselect]; };
-  processanimateR = derive2 { name="processanimateR"; version="1.0.1"; sha256="0dd09s7k46snwqjznpl38kz9xhlx9qd2n3h3y4ai7p7hpa96c22d"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang tidyr]; };
+  processanimateR = derive2 { name="processanimateR"; version="1.0.2"; sha256="0yz61m5f71lqz3f1y1lsnpbp3cpypsvj7k2cbiixl95qlpxhd1is"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang stringr tidyr]; };
   processcheckR = derive2 { name="processcheckR"; version="0.1.2"; sha256="1l8qx7ivw6vwmw7d7x7dawv11aklbyjwpyial3crhamnj5389ngj"; 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.3"; sha256="0skiavjays0qp9yvxfdzhp7iagz3zirq90m08lcl6sa83n5dj8rr"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr tidyr]; };
@@ -11891,6 +11895,7 @@ in with self; {
   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=[]; };
+  proffer = derive2 { name="proffer"; version="0.0.2"; sha256="083cxxpwkdjnj15ficfb77yiq96j0xf7z5j7h5slm9spazkr38v6"; depends=[processx profile RProtoBuf]; };
   profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; };
   profileModel = derive2 { name="profileModel"; version="0.6.0"; sha256="0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8"; depends=[]; };
   profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
@@ -11905,7 +11910,6 @@ in with self; {
   projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; };
   projects = derive2 { name="projects"; version="2.0.0"; sha256="0m9177ldp0d3f9k2ifrbww5snhvaql8h96shcdm46i1kjnzj4070"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble zip]; };
   projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; };
-  projpred = derive2 { name="projpred"; version="1.1.4"; sha256="1zlay8pj86mj68nh332ki53pz1lpdbl1k181lpmkh9dxpak0nwg0"; depends=[ggplot2 loo Rcpp RcppArmadillo]; };
   promises = derive2 { name="promises"; version="1.1.0"; sha256="01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"; depends=[later magrittr R6 Rcpp rlang]; };
   promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; };
   promotionImpact = derive2 { name="promotionImpact"; version="0.1.2"; sha256="1mx745q37fqgn46y9qj3ql54r747qfab1yq8878g08cq6y696rmp"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; };
@@ -11915,23 +11919,23 @@ in with self; {
   properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; };
   prophet = derive2 { name="prophet"; version="0.5"; sha256="0jqzmzgx3z4rl5478mw620sg539b2fwijcrzhd7jikrsv2fy7jcn"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
-  propr = derive2 { name="propr"; version="4.1.6"; sha256="1zpqx0xcf0di3p8x48g8icjwisfans0b1x902mq9fcal0qyc5mi1"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; 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.5.1"; sha256="0cznzm1ijlq33yd5wsa61prav77y2vi698w0n2fx1xcv504c4bjv"; depends=[Rcpp]; };
   protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
   proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; };
-  protiq = derive2 { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; };
   proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; };
   protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
   protoclust = derive2 { name="protoclust"; version="1.6.3"; sha256="1jwfzlxyi2mx3mry2xr2glc6fm6a9jc8fhsdzjbb4zgx7vx2vpqv"; depends=[]; };
-  protolite = derive2 { name="protolite"; version="2.0"; sha256="0vzdsngns3s4r272vh783d2v7576p4fgxbahzn2c9c6vfw7539vg"; depends=[jsonlite Rcpp]; };
+  protolite = derive2 { name="protolite"; version="2.1"; sha256="0mwpdlpxsxbj4s2s30d0w1h4dsg0j1jzzldh8kvxii9lpfkiv2gz"; depends=[jsonlite Rcpp]; };
   proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
   prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
   protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.4.0"; sha256="1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn"; depends=[attempt rlang SnowballC stringr tidyr tokenizers]; };
+  provGraphR = derive2 { name="provGraphR"; version="1.0"; sha256="0s2hj8j3rjig37wpjlr2fgw2klwr6a26mxrnk1lq5d9262x6v3aa"; depends=[igraph Matrix provParseR]; };
   provParseR = derive2 { name="provParseR"; version="0.2"; sha256="13fb4fl395aqjcs2kyvm5z1ac5jkqn5nh2ylzig2p54h313bg0dk"; depends=[jsonlite]; };
-  provSummarizeR = derive2 { name="provSummarizeR"; version="1.2"; sha256="1vdiqw9yzbihrdqqaf6796dhvw1xh93cb9wnyh804b4xvfmj1by8"; depends=[dplyr provParseR]; };
+  provSummarizeR = derive2 { name="provSummarizeR"; version="1.3"; sha256="0bbiz3lvk0lxxrcgsqww0q79505i0mzxfl03r3pm34amvqc7kl75"; depends=[dplyr provParseR]; };
   provViz = derive2 { name="provViz"; version="1.0.6"; sha256="0pnrprybn48jb02888pzn2y7vi1l24fxk6063sv6aiwpncminf9n"; depends=[]; };
   provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; };
@@ -11946,7 +11950,7 @@ in with self; {
   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.2.0"; sha256="017iqz6awc7k3kv74jdc8wak62zzgnxvakl0qp774kx1kpv6hgji"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
-  psda = derive2 { name="psda"; version="1.3.2"; sha256="1v1rllw8vafma0kxbf76a8wkbpbqkrsryaxjc1r34xg71473i0wg"; depends=[ggplot2 plyr raster rgeos sp]; };
+  psda = derive2 { name="psda"; version="1.3.3"; sha256="0asw6pq8zifacr42dwhy52xhgvl82q95a34x4ymbylj1mipka54k"; depends=[ggplot2 plyr raster rgeos sp]; };
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
   pseudorank = derive2 { name="pseudorank"; version="0.3.8"; sha256="1nj2cq8v8gj8wg23yrn8v21jwgd572gbz1wplpaxhk5v2ckhf1p0"; depends=[doBy Rcpp]; };
@@ -11963,15 +11967,15 @@ in with self; {
   pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; };
   pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="1.8.12"; sha256="0hvp0dkkkn0szaf5rkirr3kb8qmr4bxwl775m5wmpvn1kc25w5vf"; depends=[foreign lattice mnormt nlme]; };
-  psychNET = derive2 { name="psychNET"; version="0.0.1"; sha256="0lrc6klf0q8h49f3yphzmd8b9zi1ljhj7bb6vzgd5m5n8q3jyr4b"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; };
+  psych = derive2 { name="psych"; version="1.9.12.31"; sha256="02i9p6appf15hjdsi58g39bzs9as40f9qhy8m7ki30hd1fz1vrr5"; depends=[lattice mnormt nlme]; };
+  psychNET = derive2 { name="psychNET"; version="0.0.3"; sha256="14z2hiq2acc5jar8shhmp310f7fing916yhljjhy3knksdd05mjq"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; };
   psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; };
-  psychTools = derive2 { name="psychTools"; version="1.9.5.26"; sha256="1a6g78glnml22mvfkn4gjzbpmqkznsgv1pga6c0dkx4db94pcfn2"; depends=[foreign psych]; };
-  psychmeta = derive2 { name="psychmeta"; version="2.3.3"; sha256="1skvhbhkidfi9v8yk2r1qpvsmc6axvvjaiqr0rsa8wc2idavfjhd"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; };
+  psychTools = derive2 { name="psychTools"; version="1.9.12"; sha256="1l1q3l6i40kkbvfjx7nri21jqy9vhdbcc7b5g56a5cqdimkddvkn"; depends=[foreign psych]; };
+  psychmeta = derive2 { name="psychmeta"; version="2.3.4"; sha256="0nbgv7abi9i96piqggq9gsyv5p4x2h3rnr50f347mnfg55syha18"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; };
   psycho = derive2 { name="psycho"; version="0.4.91"; sha256="0yfjgsxkbp878phjvxyb2caiy5nkknkv66294arqvmadh4an7ip3"; depends=[BayesFactor blavaan broom 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-7"; sha256="16dh2y2z37h72ym1dv2xg0v20wjzlnp06h8f923cdy1zigk69d2r"; depends=[flexmix Formula lattice modeltools psychotools]; };
-  psychonetrics = derive2 { name="psychonetrics"; version="0.3.3"; sha256="0m7jsyqfgx8k77j8qg7ysdf41nhc3xa9mm8yfs95y2yk4x2lmwzp"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply qgraph Rcpp RcppArmadillo ucminf VCA]; };
+  psychonetrics = derive2 { name="psychonetrics"; version="0.4.1"; sha256="1i79hs2433qlg4qj62dwxbaz9p07byr9fy46dkqaibs5shkf03xh"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv qgraph Rcpp RcppArmadillo ucminf VCA]; };
   psychotools = derive2 { name="psychotools"; version="0.5-0"; sha256="145x1zdjvasdyf72hp6wdsw0m1r5c97gzzlbnnmdbcrjqh5zyglb"; depends=[]; };
   psychotree = derive2 { name="psychotree"; version="0.15-2"; sha256="0svb3i3d9r3hvqh17lfzyzj2rnf2wm1wy6sspx67ngdrfy6d1p91"; depends=[Formula partykit psychotools]; };
   psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; };
@@ -11980,7 +11984,7 @@ in with self; {
   pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; };
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
-  ptmixed = derive2 { name="ptmixed"; version="0.4.1"; sha256="0sqlg4pk383xig3q86c6x5dyb0ws4ccijr8v1w9526zcrabi4b8v"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
+  ptmixed = derive2 { name="ptmixed"; version="0.4.2"; sha256="02cyifia87zqgxcg1an5aq73clvkk39lamb9cdvj41145kdnz9ph"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
   pts2polys = derive2 { name="pts2polys"; version="0.1.1"; sha256="1pnh8ajh95c8xzfa4bvd2w41fi7h0jcg003rsji6xsasly3q34vr"; depends=[Rcpp]; };
   ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; };
   ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; };
@@ -11988,7 +11992,8 @@ in with self; {
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
   pubchunks = derive2 { name="pubchunks"; version="0.2.0"; sha256="119ihi6xi9k3p5lv2qkch2jc2fqmf8h0wi7mqh57asg7n6f0qb6r"; depends=[data_table rcrossref xml2]; };
-  pubh = derive2 { name="pubh"; version="0.4.3"; sha256="18n6jyidq01gxbqvfal7ipgpjvfkdy71niy7w24dvvxnvcy7hc4l"; depends=[bookdown car desctable effects Epi epiR epitools knitr latex2exp lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR sandwich survival tactile]; };
+  pubh = derive2 { name="pubh"; version="1.1.3"; sha256="0wr54x88ja4d0bpid1blz235q5kdlpyprha9nzrmwsr30s3c060n"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc lmtest magrittr sandwich sjlabelled sjPlot survival]; };
+  publipha = derive2 { name="publipha"; version="0.1.1"; sha256="0ssmkz4bbrp5yvqb2da0i6shzm59ydw2sqkmqkid039782sibjch"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; };
   pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
@@ -12026,10 +12031,9 @@ in with self; {
   pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; };
   pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; };
   pzfx = derive2 { name="pzfx"; version="0.2.0"; sha256="1h936iplhb3rnfvwvynsh1zfn3j3r0p1shr25wcn1z8axypdbsgi"; depends=[xml2]; };
-  qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; };
+  qCBA = derive2 { name="qCBA"; version="0.4"; sha256="1230sh9riazx1shhgbkkxfrks7klypj2x1vc173q09hq8bkam2ha"; depends=[arc arules rJava]; };
   qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; };
   qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
-  qMRI = derive2 { name="qMRI"; version="1.1.1"; sha256="05r5kzndmwxad3rkq4jrrg1i7gzclv32zfibsk84dwv90c4qrlyv"; depends=[adimpro aws awsMethods dti oro_nifti stringr]; };
   qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
   qad = derive2 { name="qad"; version="0.1.1"; sha256="11v291swfl4llgzfffm786xqp9cn82vl8xlqjlma5wah7ig73rgh"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; };
   qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; };
@@ -12040,27 +12044,28 @@ in with self; {
   qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; };
-  qdap = derive2 { name="qdap"; version="2.3.2"; sha256="0g072nwvqqdjcp62xl4hr94rf9xzfvs6400h4b20z44xfnnx8wb2"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
+  qdap = derive2 { name="qdap"; version="2.3.6"; sha256="1j9s5gfq2hz7vkh8j682ykfqvl11kjqa16nbmgyhv33l8wb79skf"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
   qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; };
   qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
   qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; };
   qgam = derive2 { name="qgam"; version="1.3.0"; sha256="0i0irz2jqi73d97zyy8xz2yi95y93kw3sr9xf4hmrjdd4k15l0wk"; depends=[doParallel mgcv plyr shiny]; };
-  qgcomp = derive2 { name="qgcomp"; version="1.2.0"; sha256="1kpg0hjnmfvakzq45qpng92dhi3nfvm7qd5fgqy58z453hpg5hn4"; depends=[arm future future_apply ggplot2 gridExtra survival]; };
+  qgcomp = derive2 { name="qgcomp"; version="2.0.0"; sha256="0q2mz5yynri26yfscicw344bjar7ygjmmy7hspjvqgg10mj8sla7"; depends=[arm future future_apply ggplot2 gridExtra pscl survival]; };
+  qgg = derive2 { name="qgg"; version="1.0.2"; sha256="1bxm6gg52ja8n2b54i8zhd4wp3711dq94ch7sr2lqrr6kd7w033s"; depends=[data_table MASS MCMCpack statmod]; };
   qgraph = derive2 { name="qgraph"; version="1.6.4"; sha256="1glg814h7fwl1jfm6dw1d9i80bilmj5jcjjrfln15byrdh4mm1j3"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggm ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; };
-  qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
+  qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; };
   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.6.0"; sha256="0310xczb8zzl8xl0l2fn1mw58cbkgs0xpsp3q061psv1achapxbr"; depends=[dplyr ggplot2 scales]; };
   qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; };
-  qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; };
   qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; };
   qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; };
   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]; };
+  qmix = derive2 { name="qmix"; version="0.1.2.0"; sha256="172lhvj7adphxq9gws2i9lysc9bj1wpk60f4hf2h5sisnli15v0x"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; };
   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]; };
@@ -12070,18 +12075,18 @@ in with self; {
   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]; };
-  qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+  qrLMM = derive2 { name="qrLMM"; version="2.0"; sha256="0ci4679kfif1sk4009v89yfm5p6nyk7nhvikgd00rhrbqi9qaqy4"; depends=[ald lqr mvtnorm psych quantreg]; };
+  qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
-  qrandom = derive2 { name="qrandom"; version="1.2"; sha256="1y8yybb2q4ngxvsgzm44xmhl98pdr85i80f2a7hqi8i520clwl4q"; depends=[curl jsonlite Rmpfr]; };
+  qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; };
   qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; };
   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="2.0-3"; sha256="1ymnq8mbvxfdi63f4554mjlix5n864v2nask27pkf3yfxmkr346k"; depends=[coda kernlab Matrix quantreg]; };
-  qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; };
+  qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; };
   qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; };
-  qrmtools = derive2 { name="qrmtools"; version="0.0-10"; sha256="0mkd4xigz1cg52dldbws3va7251pjzss8z0al25izmp9dbknb3gw"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
+  qrmtools = derive2 { name="qrmtools"; version="0.0-12"; sha256="1gbnc8cl0iv5snkrz5vrg3k6c5zz74amrb6yxwnlhh69yh63zxhi"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; };
   qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; };
   qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
@@ -12105,7 +12110,7 @@ in with self; {
   quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; };
   quadmesh = derive2 { name="quadmesh"; version="0.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; };
   quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; };
-  quadprogXT = derive2 { name="quadprogXT"; version="0.0.4"; sha256="1bqjlqihb371ggds60219x474b6n4wsl6fnia8hd410iyn9wm05g"; depends=[quadprog]; };
+  quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; };
   quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; };
@@ -12122,17 +12127,17 @@ in with self; {
   quantities = derive2 { name="quantities"; version="0.1.3"; sha256="0crcwcr53bpqj07q5hvqkpq1sg9ikwz3nig2ifshqq5g2a3m57qs"; depends=[errors Rcpp units]; };
   quantmod = derive2 { name="quantmod"; version="0.4-15"; sha256="0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"; 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.52"; sha256="0rq9as31wiz41lmi9hmdq3gknpcbpwqzfcn065ysjdxzjdb57dcy"; depends=[Matrix MatrixModels SparseM]; };
+  quantreg = derive2 { name="quantreg"; version="5.54"; sha256="19nh79qrkb75q348nk148l8wqjwnq5jgq29wpzqym5cfv1kjqfvh"; 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-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]; };
-  queryparser = derive2 { name="queryparser"; version="0.1.1"; sha256="1rnw653y7jykqs2knfhyjwsnq22lx7x47rli5v1b7lvgly7b2agr"; depends=[]; };
+  queryparser = derive2 { name="queryparser"; version="0.2.0"; sha256="1fsp64rm4jch2jjw7czw9qmwb4f3s46avbf3z3gpvcfdq4aw65kb"; depends=[]; };
   questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
   queuecomputer = derive2 { name="queuecomputer"; version="0.8.3"; sha256="0ravk2bxzq3zhk6mmh6iv11ql3bkpp2318vvrl39ghm5bh6pp6mg"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
-  queueing = derive2 { name="queueing"; version="0.2.11"; sha256="1rgavpivvxwww1qiphbjm25d1avhjcjv31imsrzrkwh1d12b2k7x"; depends=[]; };
+  queueing = derive2 { name="queueing"; version="0.2.12"; sha256="0hw1ykm24cjpfwh7ac7fjf7mhc59mq8wy2g07aacpy5ibwi8bbsf"; depends=[]; };
   quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; };
   quickPlot = derive2 { name="quickPlot"; version="0.1.6"; sha256="0mffialxdim8f5s0bw9bb7p8dbrfdgq1wqih441x27lnmrvhlsa8"; depends=[backports data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
   quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; };
@@ -12157,13 +12162,14 @@ in with self; {
   r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
   r2pmml = derive2 { name="r2pmml"; version="0.23.0"; sha256="1md7fzx7yc6b3plflcq4c109v2plhvb1a6dg628bhyiicjs1s83c"; depends=[]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
+  r2sundials = derive2 { name="r2sundials"; version="5.0.0-4"; sha256="1zwwrphix4smvxmb93ni1lb1vz0j9r3j3fr3n0b29y8z6lvk1q9k"; depends=[Rcpp RcppArmadillo rmumps]; };
   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.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra 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.2"; sha256="1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs"; depends=[digest hellno magrittr R6]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="2.1.12"; sha256="16ha5f21xlvpk59sxrwks5l5bsw4ldz0psgs0l2sq7cz144qls5f"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAmCharts = derive2 { name="rAmCharts"; version="2.1.13"; sha256="1c9gz7jmkh8gfaq8lmcb66kavdldnlc3x1mc1c72di8zxcpgzprc"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
   rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
@@ -12178,13 +12184,13 @@ in with self; {
   rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
   rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; };
   rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; };
+  rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; };
   rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; };
-  rEDM = derive2 { name="rEDM"; version="0.7.3"; sha256="1k5k5qpm5icgsdl859my9gx3p27fldlbbcsdzr378aaqg351pvqx"; depends=[Rcpp RcppEigen]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
-  rENA = derive2 { name="rENA"; version="0.2.0.0"; sha256="0hr45rcd756fny7sk79p2sav34jdnrc67887jgncm4jwh3bd9d6l"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppParallel scales]; };
+  rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; };
   rERR = derive2 { name="rERR"; version="0.1"; sha256="1ymf0v3r2sv9m72c19csk38fy5kmld3i18jh06rir5kxkb5l245p"; depends=[dplyr ggplot2 numDeriv plyr reshape2 survival]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
-  rFIA = derive2 { name="rFIA"; version="0.1.1"; sha256="0yd20kgcr3lszqx63ihg05lkpnw80xlnarn4lq96yay93icmarx8"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; };
+  rFIA = derive2 { name="rFIA"; version="0.2.0"; sha256="092h380z1rjwyf3s070icpcw10xnsjk6hk3phpbl7kxhx215bdjb"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; };
   rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; };
   rFerns = derive2 { name="rFerns"; version="3.0.0"; sha256="0z12201y1b9d3rd02k4y64hpnlrgkg7pi1jpzsh1br4pchdf7rrm"; depends=[]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
@@ -12196,7 +12202,7 @@ in with self; {
   rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; };
   rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; };
   rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; };
-  rJST = derive2 { name="rJST"; version="1.0"; sha256="143qb1iglfsjdcdr57mr3syrgxz6ksywm7m65hba92i2bd6ys7cj"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; };
+  rJST = derive2 { name="rJST"; version="1.1"; sha256="1a3rpj66sncawwa0hi0w6066h188hl5ssdqqgn1jnn4l7bax156j"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; };
   rJava = derive2 { name="rJava"; version="0.9-11"; sha256="0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2"; depends=[]; };
   rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
   rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
@@ -12213,14 +12219,14 @@ in with self; {
   rNOMADS = derive2 { name="rNOMADS"; version="2.4.1"; sha256="0qag0riwkrzgybwfbhpkapjcf7ccqrqa4j8zqh3xx0548k8mm37l"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; };
   rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; };
   rPACI = derive2 { name="rPACI"; version="0.1.1"; sha256="0skpv7h91vfr8xkx0ic8yz7hcj1bbwd1f80sa9p9jn2rpfpzalv9"; depends=[]; };
+  rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; };
   rPackedBar = derive2 { name="rPackedBar"; version="0.2.2"; sha256="1nh0kvj4bqkinczj8llcgy63ibsnk9vgsvm0vqg8g526x0vffdma"; depends=[data_table plotly scales shiny]; };
   rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; };
-  rPraat = derive2 { name="rPraat"; version="1.2.0-2"; sha256="00qxccdbs42d9mi33af08i4la4fi500rqxvll39mffnrwlwa3bhw"; depends=[dplyr dygraphs readr stringr tuneR]; };
+  rPraat = derive2 { name="rPraat"; version="1.3"; sha256="1ngd8q6jpzrn09042w68662hkx238ai96z9bfy0danvdii3xplyh"; depends=[dplyr dygraphs readr stringr tuneR]; };
   rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
   rQCC = derive2 { name="rQCC"; version="0.19.8.2"; sha256="091c53jggq3k9sf48pnds8s4kkqia6x268lbkb2fx88b408i0iny"; depends=[]; };
   rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; };
-  rSCA = derive2 { name="rSCA"; version="3.0"; sha256="1ka8p1slqb3a9hfc8z4j7v90k0wn6y35vmwxqaf8jlgwfhhc1v9f"; depends=[]; };
   rSEA = derive2 { name="rSEA"; version="2.1.0"; sha256="0zym2kg7vzi61xiglwr3dw5kvavjqcgjj56219aqyclkqrnf67rc"; depends=[hommel]; };
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; };
@@ -12240,7 +12246,7 @@ in with self; {
   rWishart = derive2 { name="rWishart"; version="0.1.2"; sha256="0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri"; depends=[lazyeval MASS Matrix]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   rabhit = derive2 { name="rabhit"; version="0.1.1"; sha256="010ayd8hyk02gwpnpa06n2rymxl1hy3j4jm5cn4x2xl3mj2kzg8h"; depends=[alakazam cowplot data_table dendextend dplyr ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang stringi tidyr tigger]; };
-  rabi = derive2 { name="rabi"; version="1.0.0"; sha256="1ljs6wgdw045q1acdmci5b3p8qxhhm4d6bdj64nha76fnq2rr76x"; depends=[numbers polynom shiny stringdist]; };
+  rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; };
   raceland = derive2 { name="raceland"; version="1.0.3"; sha256="0gd5x3k1mdk6s1svgv9vgy2bzml6qg74rfr6p009g2bkbxpcjydy"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo sf]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
   radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; };
@@ -12257,33 +12263,34 @@ in with self; {
   radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; };
   radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; };
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
-  radsafer = derive2 { name="radsafer"; version="2.0.1"; sha256="0qzd7zzflyr5gzk1ad3wwn8mxrzijzv9fnj76q43qb1mgr4d5sww"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; };
+  radsafer = derive2 { name="radsafer"; version="2.1.0"; sha256="01xsrl39rv8jjm7rkqy24q6p92i4axyia6gn4d174c18kavz1rj1"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
   ragg = derive2 { name="ragg"; version="0.1.3"; sha256="116dmzy81y3r4jpbv7gqx76y33rgrsdzklr0vhblzsph52a59i7m"; depends=[systemfonts]; };
-  rags2ridges = derive2 { name="rags2ridges"; version="2.2.1"; sha256="0xiv4dhzxbxy9bqjpz8rfrh0pzxbsnkg5wgz61c643slidgs0h0d"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; };
-  ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.2"; sha256="03613amz11ixgkjhc8rg4vp3ih60g1ibhdjrldr9mazzkak46y91"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
+  rags2ridges = derive2 { name="rags2ridges"; version="2.2.2"; sha256="1xayfj9ac1czl6pipfnr3a3r0jrdfvsqiksf9w4blavpp9xv9dbp"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; };
+  ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.3"; sha256="1vk1pvfbf0b59wkvwj33y80wlvvqmqc0k6l64li7avig1im3n088"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="1.1.0"; sha256="1gz4hdfb4yxjqcmclxw2yacpk0km29n3gfpqkcj48wr1s6vv7djb"; depends=[futile_logger limSolve]; };
   rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; };
   rainbow = derive2 { name="rainbow"; version="3.6"; sha256="11vfcck17d2xjc049ci5i8l1nqv345anmd110gdz7654i1pj9lb3"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
   rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; };
   rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; };
+  ralger = derive2 { name="ralger"; version="1.0.0"; sha256="069cnlxj7kclw84wsx9mcrs7zhxzsg1983vi78c0zksii6q8lbqa"; depends=[dplyr magrittr rvest stringr testthat tidyr xml2]; };
   ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; };
   ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; };
   ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
   ramlegacy = derive2 { name="ramlegacy"; version="0.2.0"; sha256="0q8qks8qapar12dzlkxlbvw4rj7qxmfw64cph834ckm4z7sis873"; depends=[cli crayon httr rappdirs readxl]; };
-  ramps = derive2 { name="ramps"; version="0.6-15"; sha256="0c7y64z0ysjy0kh234xfqhbwwn1vgscvp1n4l2fjk5s5xz8633pn"; depends=[coda fields maps Matrix nlme]; };
-  ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
+  ramps = derive2 { name="ramps"; version="0.6.16"; sha256="1az2wp1jrf4yszcgq9l18g4b9bi2hkg0q6nymdaksbn20jkhwg32"; depends=[coda fields maps Matrix nlme]; };
+  ramsvm = derive2 { name="ramsvm"; version="2.1"; sha256="18cal64r14gr73aws27cyjx1p768m064xy7rsnx7spv5hwajhwcl"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
   randcorr = derive2 { name="randcorr"; version="1.0"; sha256="1hnr0wvbsmgql39wlj4z2qbqn0fdfwyihfl6xgrlzvs9vrmig5xx"; depends=[]; };
   randgeo = derive2 { name="randgeo"; version="0.3.0"; sha256="14hlh9k66lcbf0xhnxx12rrnyl8awqcsm3csvxdz23s5wnm2ya5p"; depends=[]; };
   randnet = derive2 { name="randnet"; version="0.2"; sha256="1hiqwz9q9nd8s5p97m6hgam1hmp33y0lks4sybzj2w3r5qdb1g2a"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; };
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
-  random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
+  random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-3"; sha256="00mzkchkzry5gi1gzgghkhljn21pj1aakpmd4pkcdm0hy5vj9pg2"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
   randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.10.0"; sha256="08j4mj6r595kzkrgkvjhkda9x6w275nmnvmmhmyk0knq2p2g7p2r"; depends=[data_table dplyr DT GGally ggplot2 ggrepel randomForest ranger reshape2 rmarkdown]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.2"; sha256="0x3d9sycrn4yfsdx8b543d1jnrw7i0klsvapvzx7c9hbr83vq3vq"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.3"; sha256="05ifvj49jv0n5p6k46milpgj9r10sc5aw23fypyyibdgwpwvwixw"; 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.4-0.0"; sha256="1kchngfjv53n32z2qjrplp2xmssl8gjx1y3m7bxsfq1wjzj52qf5"; depends=[crayon data_table toOrdinal]; };
@@ -12298,18 +12305,17 @@ in with self; {
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.30.0"; sha256="141p13ajgzmb2s89rlac7zrra92mi1izvpfrngb4kqzlf3igdsqd"; depends=[rngWELL]; };
-  rangeBuilder = derive2 { name="rangeBuilder"; version="1.4"; sha256="1jjy1d3kljysm3mqgdszdi6incbmg2di63akxswfaiqcp1m68a6y"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; };
+  rangeBuilder = derive2 { name="rangeBuilder"; version="1.5"; sha256="17wyf9ljgdbpxgl9gy6f1279h88k0rjfcarw7kgp145bm3c36jwf"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; };
   rangeMapper = derive2 { name="rangeMapper"; version="0.3-7"; sha256="0b457qxlhwcnsw9x60mccvivq7a5cg7lkyfmsfva7qaipnjixcmh"; depends=[classInt data_table doFuture foreach future future_apply ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
   rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.2"; sha256="1d31nz2izppkj0zsm6iq74py5s7zg4w3vvjjxzbzprnj2x6r9zlw"; depends=[biomod2 dismo dplyr ecospat ENMeval googlesheets jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; };
   rangemodelR = derive2 { name="rangemodelR"; version="1.0.4"; sha256="0y8hdqi04n3pc3iwz82gikn61h42bmfi7iccwgbglk8wkrkg4gy0"; depends=[]; };
-  ranger = derive2 { name="ranger"; version="0.11.2"; sha256="1sxyzxmjc6lm8wcmq15j6sscnza7aay4mr3dyri2zngx6fa8mb0k"; depends=[Matrix Rcpp RcppEigen]; };
+  ranger = derive2 { name="ranger"; version="0.12.1"; sha256="1vr5akgh388iivrxi0g4pl2npq9dc4cim3ljk4kjf637q058wc7w"; depends=[Matrix Rcpp RcppEigen]; };
   rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; };
   rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
   rapbase = derive2 { name="rapbase"; version="1.10.0"; sha256="0x1xr0qw5qq9rsas3ysxlvmim3jhkf5za4lxr6f15vx4rjfx77wv"; depends=[DBI devtools digest gistr httr knitr magrittr readr RJDBC RMariaDB sendmailR shiny yaml]; };
-  rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
+  rapiclient = derive2 { name="rapiclient"; version="0.1.3"; sha256="1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"; depends=[httr jsonlite yaml]; };
   rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; };
-  rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; };
   rapidxmlr = derive2 { name="rapidxmlr"; version="0.1.0"; sha256="14pa08yp8xmbqk8wwinz1xsphx75xq6vg8zgzcxc5zgmcf0ja5if"; depends=[]; };
   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]; };
@@ -12318,14 +12324,14 @@ in with self; {
   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]; };
-  rasciidoc = derive2 { name="rasciidoc"; version="2.0.0"; sha256="1bqabjr8h0ldhmf7mirk0fkv6nrv80zrm2vrx836ib5cxb2hw1yv"; depends=[document highr knitr]; };
+  rasciidoc = derive2 { name="rasciidoc"; version="2.0.1"; sha256="0mj3qn048ppxddq2ml06hvccixxg7kvb9rsx9iy9mn4rr2caw67v"; depends=[document highr knitr]; };
   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="3.0-7"; sha256="0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; 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.46"; sha256="0lzjqkm22qfcmzgnjv9k9b49hx9xa3vjwcl9935a5kjqsn57ipdy"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.47"; sha256="1lsi3vk7s3bzw07vn57s6748flmbrj5s3n349cxbmhlm123vwghj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; };
   rasterly = derive2 { name="rasterly"; version="0.1.0"; sha256="128699nc1y2parfwqfx31afdy3f91z5iarpx8q1v5qfmbmb12ppx"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; };
   rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; };
@@ -12336,16 +12342,15 @@ in with self; {
   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.2.0"; sha256="099anyq4spb7dbikxb29aacqp4xswr66hxjgxiwcvhm9jjryb33v"; depends=[dplyr ggplot2 magrittr rpart_plot stringi stringr tidyr XML]; };
+  rattle = derive2 { name="rattle"; version="5.3.0"; sha256="1siwnmh5yna63354jd8aypffk1naicvvnjykv5cssqyjdldcwp37"; depends=[dplyr ggplot2 magrittr rpart_plot stringi stringr tidyr XML]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
-  raustats = derive2 { name="raustats"; version="0.1.0"; sha256="0wyq45v4d5gyrn2zbn0qj7wm4a0jh0xjlp6wzzpdiy2w3c9xwx5z"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; };
+  raustats = derive2 { name="raustats"; version="0.15.0"; sha256="047vs3wvakwkh7c98rgswhj73m43d6ryax2jblbdp5199knn5cm5"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; };
   raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; };
   rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; };
   raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; };
   rayrender = derive2 { name="rayrender"; version="0.4.2"; sha256="070h6p7dmai0rrdiyghr97i3jn9yj86ak74zvw019b6g50rid6h6"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; };
-  rayshader = derive2 { name="rayshader"; version="0.13.1"; sha256="0szwa07kyakgyd0cgj9fl9v7szchi8bqg2j2v8pqmxzs6i103qhr"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; };
+  rayshader = derive2 { name="rayshader"; version="0.13.2"; sha256="1s2n862s7wwgqwy28j02g68k5xdxzx115qvv205shwgrpy5aszz8"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; };
   rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; };
-  rbamtools = derive2 { name="rbamtools"; version="2.16.17"; sha256="0qj37ljdva3v29s01dkrbg31mcfzy3bl145cp40d54v4h9xhcghc"; depends=[refGenome]; };
   rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; };
   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=[]; };
@@ -12358,7 +12363,7 @@ in with self; {
   rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; 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]; };
-  rblt = derive2 { name="rblt"; version="0.2.4.4"; sha256="0psxv9rrbyk4j4nh60fwcn67xk2czhyzdjvjn52256ag192z6lms"; depends=[data_table dygraphs h5 shiny xts]; };
+  rblt = derive2 { name="rblt"; version="0.2.4.5"; sha256="1pfg8sgm532czz3lhpx7dmg5zik3bc0p4vdq9s0qk5zgq7nnm9sj"; depends=[data_table dygraphs hdf5r shiny xts]; };
   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]; };
@@ -12370,7 +12375,7 @@ in with self; {
   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.2.0"; sha256="0dd7x7i8d592gnn9c3dk706drd3irhi1k4iivlngfm44ck3wlpzn"; depends=[doParallel foreach knitr sp]; };
+  rcarbon = derive2 { name="rcarbon"; version="1.3.0"; sha256="1g17hdqs64hpnq77hxy0krpl1nl89g8433dn67bycfzbpih8xnr6"; depends=[doParallel foreach knitr sp spatstat]; };
   rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; 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]; };
@@ -12378,10 +12383,10 @@ 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-2"; sha256="0pzpbqnlgzr240iici70278py5wnbbxkzlgn112f9wv5ga3riric"; depends=[]; };
-  rcdk = derive2 { name="rcdk"; version="3.4.7.1"; sha256="1d08ajji631792b7fyfwzvcaswh8jlanfsxrj6c1wx7xh3qqpigg"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
+  rcdk = derive2 { name="rcdk"; version="3.4.7.2"; sha256="0fnbv8gjzl77c5s1byw8xn16dxxpd7phcyqzd284x7n010fmdyq6"; 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.6.1.0"; sha256="08z1nygygl2b5qri1nngjijzf8dnpx4f67h71f2mm6v7mykjqwrd"; depends=[]; };
+  rchallenge = derive2 { name="rchallenge"; version="1.3.2"; sha256="1qib09vlajw62zdhx8gkmmhlgc8k0dqdxx8ai8zdwxhfff253glc"; depends=[knitr rmarkdown]; };
+  rcheology = derive2 { name="rcheology"; version="3.6.2.0"; sha256="19llfyvaqiv5dzmw4lkfaia28hi4n1s66iazh8yw7nqql16s4nj8"; depends=[]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
@@ -12389,7 +12394,7 @@ in with self; {
   rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; };
   rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; };
-  rcompanion = derive2 { name="rcompanion"; version="2.3.7"; sha256="19s39khwnlilqgrq7a0dxphw5d5nzrb5550db3c61j2m1fxvy15z"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
+  rcompanion = derive2 { name="rcompanion"; version="2.3.21"; sha256="01mvgs3q43mx630c54pc7i1kxljaliyxyv38pa6hgp4arh75aj7f"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; };
   rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
@@ -12402,17 +12407,16 @@ in with self; {
   rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; 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.1"; sha256="1y4fawslr3i6crjaxhsdb47kfsqkyszdx6avq3r5far5a4pvc639"; depends=[]; };
-  rdatacite = derive2 { name="rdatacite"; version="0.4.2"; sha256="0ix2z8xrnv16qwnwhil7d0zr9bnzhhgd3i7r4m9xylayj80r0pcd"; depends=[crul jsonlite oai solrium]; };
+  rdatacite = derive2 { name="rdatacite"; version="0.5.0"; sha256="15db4p8scx0b3br0vrxyxc0k8pfiki057vkfka3qjv1gbj1ab2d8"; depends=[crul jsonlite tibble]; };
   rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; };
-  rdbnomics = derive2 { name="rdbnomics"; version="0.5.0"; sha256="04zmipmkx8yr09q8kbdl4a76hly5yy3v67fcqny14xnx3iga3vja"; depends=[curl data_table jsonlite]; };
+  rdbnomics = derive2 { name="rdbnomics"; version="0.5.1"; sha256="0m55k92a74lnwfsxz6z102mvqvz6lkhwq38m000hbs5z2k27h620"; depends=[curl data_table jsonlite]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
   rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; };
   rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; 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]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
-  rdflib = derive2 { name="rdflib"; version="0.2.2"; sha256="0l0bhv9z5g7js5jc39avyxa60jps9wgbrybbdx7hqgynm3ypc4mr"; depends=[dplyr jsonld readr redland stringi tidyr]; };
+  rdflib = derive2 { name="rdflib"; version="0.2.3"; sha256="1hc6a0spmbd42lf7zjkwjv4glagfzsdilv5hm8c76cj36incg6qg"; depends=[dplyr jsonld readr redland stringi tidyr]; };
   rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; };
   rdhs = derive2 { name="rdhs"; version="0.6.3"; sha256="01pjb9wjad22rv85z0rxrh06wyzksy0xgd656xd3lck0ixpr88hx"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; };
   rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; };
@@ -12420,19 +12424,19 @@ 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.5"; sha256="1dadb3yazk9kn051rswq3568m77x44485l2268ahm0im6bj2i7al"; depends=[AER sandwich]; };
-  rdmulti = derive2 { name="rdmulti"; version="0.3"; sha256="0s65zpy4zlqzdg34wq1bf2g0r97iak3fscrik2p83p4ah4gf4raw"; depends=[rdrobust]; };
+  rdmulti = derive2 { name="rdmulti"; version="0.4"; sha256="11qh5sdnxmpk1bhkcb4bq7qmj0hvvc9p4hq0pwnkgq4vfj6gsi2d"; depends=[rdrobust]; };
   rdnb = derive2 { name="rdnb"; version="0.1-3"; sha256="0g85masa1a2c26l12i6ck1hdjvm2saqdlqnwb2p29rm9spmc04qg"; depends=[brew httr stringr xml2]; };
   rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; };
   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.4"; sha256="050yy1zwkxniqails24nmmaglcmlx50niqqqw5sgqfyn64yxndk1"; depends=[rdrobust]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.99.4"; sha256="0ykz9lgkr95l6h7jk9k8k0yv26hd4iyvgr9j298l388ry9w1ph9w"; depends=[]; };
+  rdrobust = derive2 { name="rdrobust"; version="0.99.5"; sha256="139c6z2n7s8j1pmc6afad7f1lgxgi09wj4wgi5j49w7xhyd8yc7r"; depends=[ggplot2]; };
   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]; };
-  rdtLite = derive2 { name="rdtLite"; version="1.2"; sha256="1g4y8rsq7hy8kwradlmkmf4r309128mb3mfdyxjb24acazmaybyl"; depends=[curl digest ggplot2 gtools jsonlite knitr rmarkdown sessioninfo stringi XML]; };
+  rdtLite = derive2 { name="rdtLite"; version="1.2.1"; sha256="0mm2psp8j1dfvah5d68a721kl3klins038nwgbv4s6x38a9amvq6"; depends=[curl digest ggplot2 gtools jsonlite knitr provSummarizeR provViz rmarkdown sessioninfo stringi XML]; };
   rdwd = derive2 { name="rdwd"; version="1.2.0"; sha256="1vcw5pcvcw1rx6dwwwh9j9g2pb1m81g812abd5h8zq5n7plkd2jk"; depends=[berryFunctions pbapply]; };
+  rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; };
   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.2.1"; sha256="0nfi02wlmb1n8j134qgv3p03z2j200kkrwhvd5i17ybhzpwfndri"; depends=[BB ggplot2 MASS nleqslv reda scam SQUAREM survival]; };
   reactR = derive2 { name="reactR"; version="0.4.1"; sha256="0fzx0qy9s366gd81xiz36k3v4d9sdsrrf3m5azlghvbvq5h42wxv"; depends=[htmltools]; };
   reactable = derive2 { name="reactable"; version="0.1.0"; sha256="00ydsx8g27a40qwnkp593dd9pn62r32riry9ayhv3nzqa6mwzb4d"; depends=[digest htmltools htmlwidgets jsonlite reactR]; };
@@ -12447,7 +12451,7 @@ in with self; {
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
   readODS = derive2 { name="readODS"; version="1.6.7"; sha256="1nvkhjv3i6l7d15v2abxg4141hrgv2jmc4agxi2d0wv6j1fc1ya1"; depends=[cellranger readr stringi xml2]; };
   readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
-  readabs = derive2 { name="readabs"; version="0.4.2"; sha256="08lkddcfvb3j4nlkbnqwxb7w7a95hklfgky6jhlk119r1czb5ycd"; depends=[curl dplyr purrr readr readxl rsdmx stringr tibble tidyr XML]; };
+  readabs = derive2 { name="readabs"; version="0.4.3"; sha256="11v34683d1c8dxkd3v4h67bxpzjkgp9xw06fa6ijhw1z8hsgmmy6"; depends=[curl dplyr fst hutils purrr readxl rsdmx stringi stringr tibble tidyr XML]; };
   readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; };
   readbulk = derive2 { name="readbulk"; version="1.1.2"; sha256="0341sp9jqqci62zx6my4r50dwrysgjppjasx2lf1dj8w5bv559rd"; depends=[jsonlite plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
@@ -12465,7 +12469,7 @@ in with self; {
   readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.10.3"; sha256="0yhazicibq8h2d7ldv59isapc6f68psawa3vrs1fdzwkrraj6893"; depends=[mvtnorm]; };
+  rebmix = derive2 { name="rebmix"; version="2.11.0"; sha256="1rmpgzxpxk3dr0c625j5g37kvxvlqwprkixk7lwjwn4lviin3cwq"; 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]; };
@@ -12473,7 +12477,7 @@ in with self; {
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
-  recipes = derive2 { name="recipes"; version="0.1.7"; sha256="1gw8x7vqj7k18mfpiqinyfwzv9i5r0pb51k7xcfxsjap6m9nks98"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
+  recipes = derive2 { name="recipes"; version="0.1.9"; sha256="1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; };
   reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recmap = derive2 { name="recmap"; version="1.0.5"; sha256="1xl2j6zjk1vyf2zz8zcl4532k0c1jkrjqhp3vndnl5ynqr5nqlph"; depends=[GA Rcpp sp]; };
@@ -12485,6 +12489,7 @@ in with self; {
   reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; };
   recorder = derive2 { name="recorder"; version="0.8.2"; sha256="1j3fqqp5vi8z3hxqgb887v9r8x0cl5jikiyx3c7arwna7k89215a"; depends=[crayon data_table]; };
   recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; };
+  recurse = derive2 { name="recurse"; version="1.1.2"; sha256="0bdm2nd8cq64dwz9b2hnbjv6c3fwpy7gnmbfi6p49nf285p8y632"; 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.1"; sha256="0bd1jzjip6p449m9ysi4kybxqljh2wj8z9mrgyk1cy08bjivd1cd"; depends=[imager]; };
   reda = derive2 { name="reda"; version="0.5.0"; sha256="05lbhamd8z0bhc7cvpd24nmgsc5lfzidjynbi0dzbvkn2gphpdzs"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; };
@@ -12496,13 +12501,12 @@ in with self; {
   redshiftTools = derive2 { name="redshiftTools"; version="1.0.1"; sha256="0rg9s9i7cdy2qm45bpm50d7859pqx1kmk4m8gpazkp0kgr7alb7l"; depends=[aws_s3 DBI progress purrr]; };
   redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; };
   ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; };
-  refGenome = derive2 { name="refGenome"; version="1.7.7"; sha256="1za89bn3am1zgvm641qi1ab6kaqpll4rb9p9f1sjwvcgqq6065g5"; depends=[DBI doBy RSQLite]; };
   referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
   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.3.2"; sha256="0ksznc72yvcscviqq6iysjkbkklqxff04q0rsh2l8gyy7g7m9415"; depends=[dplyr httr jsonlite tibble]; };
-  refund = derive2 { name="refund"; version="0.1-17"; sha256="1lz90y3zim0vl2gxiy4zw0qhkvg7i0p64jqabblnlx13f3lzn944"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
+  refund = derive2 { name="refund"; version="0.1-21"; sha256="09lbiyr642c3mgdgcy0j5j64s8k7nai4x7grzlh93apkaj8yrm44"; 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]; };
   regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; };
   regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; };
@@ -12529,9 +12533,9 @@ in with self; {
   reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.1"; sha256="176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"; 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]; };
-  rel = derive2 { name="rel"; version="1.3.1"; sha256="1a3gffa9jgfm92q0ba9slwdp8r1n5kycywxp0jbjkpvkdpmacnd4"; depends=[]; };
+  rel = derive2 { name="rel"; version="1.4.0"; sha256="1aswhbb5rfda1bfrasxjj5z6f9fxl7x9m9xcg0x3nvnj4qbfamfp"; depends=[]; };
   relMix = derive2 { name="relMix"; version="1.3"; sha256="0saa4gz4mghg15cbbx5y933vp41j94cdzvgkc112632dbp20bqd9"; depends=[Familias gWidgets gWidgetstcltk tkrplot]; };
-  relSim = derive2 { name="relSim"; version="0.2-9"; sha256="0qy1fy7xclzaqwhxpclllpypac41s406jc413cgd4jss5c87k4c4"; depends=[multicool Rcpp xtable]; };
+  relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; };
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
   relaimpo = derive2 { name="relaimpo"; version="2.2-3"; sha256="0pbffalyhmfigyynkl6il60dyyf2aw1i71sncwrqcp18qgx4bxq9"; depends=[boot corpcor MASS mitools survey]; };
@@ -12541,6 +12545,7 @@ in with self; {
   reldist = derive2 { name="reldist"; version="1.6-6"; sha256="09vips7spcz0fahrpy0bl15hk43zgnq74h189hmygyi41l95aywa"; depends=[Hmisc mgcv]; };
   relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; };
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
+  relgam = derive2 { name="relgam"; version="1.0"; sha256="0bfsk2pc3vdk8wgdfpz80x0f9p0z37sq114swqn6z11p298hwf2x"; depends=[foreach glmnet]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
   relsurv = derive2 { name="relsurv"; version="2.2-3"; sha256="0jiky939n8vi44n8xg9kag67xjvf1dpywyjrn4bpdfrvfmkrr0l9"; depends=[date survival]; };
@@ -12556,16 +12561,15 @@ in with self; {
   remss = derive2 { name="remss"; version="1.0.0"; sha256="0dl7iqg65qgafq7s1srcymqzvplkpzplpn6g68lb1mqirqzvgpqw"; depends=[survival]; };
   renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; };
   rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; };
-  renv = derive2 { name="renv"; version="0.8.3"; sha256="0034jlaq7z40q3hcpkjlaff37dpn46kvxvzw4scbwlw4x9q8sx9j"; depends=[]; };
+  renv = derive2 { name="renv"; version="0.9.2"; sha256="1jwnabryn77s29ybwdfzlnd7c8m05xmi69kp5qbvdxy2gjwjzcdr"; depends=[]; };
   repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; 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]; };
-  replicateBE = derive2 { name="replicateBE"; version="1.0.12"; sha256="1vvl88vak56s2q96crr34q8lpwp0davpqysvzxrs5y1sswb6xb3b"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; };
+  replicateBE = derive2 { name="replicateBE"; version="1.0.13"; sha256="1r5c4gwbwcdkcp1by8n3l4fn54vaxhp9fc5zbmgn43rpwbz1nsma"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; };
   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="1.0.5"; sha256="0k77rz0vwgyhdgvry3j2i290w1378fjjfkfrykb0b6wjs7pq4q4b"; depends=[DBI dbplyr 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]; };
+  repo = derive2 { name="repo"; version="2.1.4"; sha256="0492jh20aknabjlw6k32bq11vc6gvypahplxmg6slpgfi15zkqg5"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
   reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; };
   reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; };
@@ -12573,11 +12577,11 @@ in with self; {
   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="1.0.1"; sha256="0jy43g34r38fqprcdys0p9pliahrj5l64a9bbkzy206qgz0j5ppc"; depends=[base64enc htmltools jsonlite pillar]; };
+  repr = derive2 { name="repr"; version="1.0.2"; sha256="0wn9fdddqjgn0bdfl75x89rcxahbgqs324bhg0pfq6va5q2mlbbw"; depends=[base64enc htmltools jsonlite pillar]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; };
-  reproducer = derive2 { name="reproducer"; version="0.3.0"; sha256="0z0gkikr5219wb20hndqlflxar1mn3638zn2095ja0b2d1cn40nk"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 magrittr MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; };
+  reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; };
   reproducible = derive2 { name="reproducible"; version="0.2.11"; sha256="08pjmhhcgcrnrr8w6sdc3phz2ymp2b7gml0848f384blqkg9wavj"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; };
   reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; };
   repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; };
@@ -12585,7 +12589,7 @@ in with self; {
   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.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; };
-  rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.5"; sha256="1c185qckr931a0rqr5l1c4vpcqy1ll8387ssb0lfrwbah41j11sj"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
+  rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.6"; sha256="0akqprias7lxkg927yjdwcs7311rqjgnn5286g9r9rw813slc7vk"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; };
   rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
   resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; };
@@ -12596,20 +12600,21 @@ in with self; {
   reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; };
   reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
   respirometry = derive2 { name="respirometry"; version="1.0.1"; sha256="1syc2gf3jri90pi0qmrhwg472rn6dx8abpr9yb8jb5q1f1qs07p0"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
-  restatapi = derive2 { name="restatapi"; version="0.4.0"; sha256="0syacz5fy0hcqfzj0x0ymkdwb61j9qn9s4maijywpd3yhrk2ijjs"; depends=[data_table rjson rsdmx xml2]; };
+  restatapi = derive2 { name="restatapi"; version="0.6.2"; sha256="0mp5bd867w669w6219296ymzqn35nd306yfjb5pbi03sirqmk4lr"; depends=[data_table rjson xml2]; };
   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]; };
   restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; };
   restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; };
-  restriktor = derive2 { name="restriktor"; version="0.2-250"; sha256="0ks6fg76y1h7mgdxgl0w895ykwp3dri6if2va08aj4sqxcgg1rpa"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
+  restriktor = derive2 { name="restriktor"; version="0.2-500"; sha256="14p66ckr8lyjl905y0wkqz6s8a0gsy7z6ndkpigwbzssq27jn0am"; 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.13"; sha256="1qwxh7zq9igl7dxl5g5qjbvv0mlac3w80djnkm0w8rxnaval3gmd"; depends=[jsonlite Matrix Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.14"; sha256="0icb9zl9zlx75njv7y1dr450k0yw2n3q2jkr4nicnphdyfn69gkn"; depends=[jsonlite Matrix rappdirs Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
-  retistruct = derive2 { name="retistruct"; version="0.6.0"; sha256="1d7whcvz7im9h2cblldc4kjxw8fpj08q0k0hv0yyb1gkzp4snhrf"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; };
+  retistruct = derive2 { name="retistruct"; version="0.6.2"; sha256="191kpd3fwgv48i4a048lgrir3lcvyjvaj41hxifxgkkg1g0gv3f0"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; };
   retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; };
   retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; };
+  retrosheet = derive2 { name="retrosheet"; version="1.1.0"; sha256="1k0qnq9a3ixk91qmmp5wxwv8l0878yx5h32a458w5a4h4ip434jx"; depends=[data_table httr rvest stringi stringr xml2]; };
   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.6"; sha256="15nrmnl3g4l8yn6x1xvbfjn4fznryvgkvaqyxjr929v05rrf3fl0"; depends=[bayesplot Rcpp RcppArmadillo rust]; };
@@ -12618,24 +12623,25 @@ in with self; {
   revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; };
   reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; };
   revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; };
-  revtools = derive2 { name="revtools"; version="0.4.0"; sha256="138k9pcdv1gxfh52wlxavy6dinwqigrnckwka8bg3rwhdw0j8cky"; depends=[ade4 modeltools NLP plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
+  revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
   rexpokit = derive2 { name="rexpokit"; version="0.26.6.6"; sha256="13dxra3s68i499g21z9i93mbn6n8s4xay5zmvslafaccbq3q1ray"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.7"; sha256="0dhgxm9b2djgadr1wnwgd0gbqv7751y0ln4jis32p0qmwi30v76d"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr]; };
   rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; };
   rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; };
-  rfacebookstat = derive2 { name="rfacebookstat"; version="1.10.1"; sha256="0a0qd9ha520z0smkb3pkjqc6a2f6vhy5m311wh9cmldnq633ycck"; depends=[bitops data_table dplyr httr jsonlite purrr RCurl stringr tidyr]; };
+  rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.0"; sha256="07mchcma7ab3wvz6rp1zmcfqn7bnd6w1w3jrsq22v851nzvw39jk"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; };
   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]; };
   rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; };
   rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
+  rfishnet2 = derive2 { name="rfishnet2"; version="0.1.0"; sha256="054cdgffy56yf5i0wy6kkyc68lim3zlk9czi6k5cy87lfjzcjqs9"; depends=[ggplot2 pracma sf]; };
   rflexscan = derive2 { name="rflexscan"; version="0.2.0"; sha256="008xpbdqix18lwdqcx0mixwhv8v47kzpkblr53igp5766l04nfyj"; depends=[igraph Rcpp rgdal sp]; };
   rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; };
   rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
-  rfoaas = derive2 { name="rfoaas"; version="2.0.0"; sha256="04wx3d6v9zci6i5k3c4nfdycgjmng7f533b9k84kf1pa4lwp45ad"; depends=[httr]; };
+  rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; };
   rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; };
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
   rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; };
@@ -12647,12 +12653,11 @@ in with self; {
   rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
   rgeopat2 = derive2 { name="rgeopat2"; version="0.2.6"; sha256="04r8q3mig7sp38f3m9g20xlb0h046c04hhrzg4n06b5wkn7298s5"; depends=[readr sf stringr]; };
-  rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.0"; sha256="1s72l7gl370gfcwdhv1qqsyiq8qb530yi1dn4frslf6ay00yash9"; depends=[aspace geosphere leaflet pals RANN_L1 raster sp splancs]; };
+  rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.1"; sha256="0frpipmmhywbahcyj5rhypp9qxqkp6xkdj6sn8w1ipw6gv02zp7b"; depends=[aspace geosphere leaflet pals RANN raster sp splancs]; };
   rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; };
-  rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; };
   rgl = derive2 { name="rgl"; version="0.100.30"; sha256="0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
-  rglobi = derive2 { name="rglobi"; version="0.2.20"; sha256="0fygxl5bfkkl5d2wadpbk5xg0y6kab4c99mliwlzvl9d3mqpnpsp"; depends=[curl RCurl readr rjson]; };
+  rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr 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]; };
@@ -12660,17 +12665,19 @@ in with self; {
   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.7"; sha256="1y6dlpzid5apjx0gphkym7gq3lhwp0bxan8ca274pg170xyb33h8"; depends=[htmlwidgets jsonlite magrittr]; };
+  rhierbaps = derive2 { name="rhierbaps"; version="1.1.3"; sha256="0i4sr2wwzzl8vki5zihnd8v4ia2kji09cmf4ld07b6k099g5xprr"; depends=[ape ggplot2 matrixStats patchwork 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.3.0.0"; sha256="1nmnrib3dlsf2cswnx19l63449cv4yl6nbq5ih5j7m9ygxr8b8s8"; depends=[Rcpp RcppArmadillo]; };
+  rhoR = derive2 { name="rhoR"; version="1.3.0.2"; sha256="1hzykkvzwv2mb759m9rw32dd1wgmksizqyr6grqf6a2z77k7w197"; depends=[Rcpp RcppArmadillo]; };
   rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; };
   rhub = derive2 { name="rhub"; version="1.1.1"; sha256="05b4phrny85fshismspjbaz1h0klg1fpy4b309si94pnqffxaqx6"; depends=[assertthat callr cli crayon desc digest httr jsonlite parsedate pillar prettyunits processx R6 rappdirs rcmdcheck rematch tibble uuid 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.2"; sha256="0z6mbhrda7fh7a4y2kx3mf1zc1p0k4d76phw3187w50kwvkpb737"; depends=[estimatr generics ggplot2 pbapply randomizr]; };
   ribd = derive2 { name="ribd"; version="1.0.0"; sha256="1r3w8zfihs5i1al0g136319zaj2dr0x52s3spxrcvd0irq9r4v8b"; depends=[glue kinship2 pedtools slam]; };
+  riceidconverter = derive2 { name="riceidconverter"; version="1.0.5"; sha256="10r869fxry4056izaar1yjyl8ad2wyy6fvbrzwbxd76fifq49l7j"; depends=[dplyr]; };
   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.4"; sha256="18a16653k850sfxw9rmk4spy44hn93i97b2a0jfx41qh43hmkgqy"; depends=[]; };
@@ -12681,11 +12688,11 @@ in with self; {
   rifle = derive2 { name="rifle"; version="1.0"; sha256="1r0cfj3vzndgiarl9sb38zmpnpm4p8v9l5cm9c1m6g2q9kvpgpbs"; depends=[MASS]; };
   riingo = derive2 { name="riingo"; version="0.2.0"; sha256="1dbi86aic2p8c0dzf7m04chn9rj7y2v8qq8hivlvagq04y40yn6c"; depends=[crayon dplyr glue httr jsonlite purrr rlang tibble]; };
   rijkspalette = derive2 { name="rijkspalette"; version="1.0.1"; sha256="0al5niymn6k6px6fh1pk3rvk3a3b2966bdfh0hprcjjl75a9mgvq"; depends=[crayon curl imager jsonlite]; };
-  rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
   rintrojs = derive2 { name="rintrojs"; version="0.2.2"; sha256="0vyqb3pyrh12saddar71ac9csn2vkd2j8ln6ygpqys8ky1lc3427"; depends=[jsonlite shiny]; };
   rio = derive2 { name="rio"; version="0.5.16"; sha256="0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
   rioja = derive2 { name="rioja"; version="0.9-21"; sha256="01vc7zfw13zdri0rx93adx86gprzcmw9d454848ach95hdkwipk5"; depends=[mgcv vegan]; };
+  ripe = derive2 { name="ripe"; version="0.1.0"; sha256="0dmf8i8l9ja590fakpgi6lf128wd7cd49g4ihm02cbsn8h5ha27s"; depends=[magrittr]; };
   rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; };
   riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.1"; sha256="0l51spflm7wwwz5yrkw1i5534d1840wyyh2w3mz8apaxac76l0xz"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; };
   riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; };
@@ -12706,7 +12713,7 @@ in with self; {
   rjags = derive2 { name="rjags"; version="4-10"; sha256="1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx"; depends=[coda]; };
   rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
   rjdqa = derive2 { name="rjdqa"; version="0.1.0"; sha256="07qvvy3i0ak7p717wf68gx8d1m9l4lhibf0ynmc0jny58i56fiw8"; depends=[plotrix RJDemetra]; };
-  rje = derive2 { name="rje"; version="1.10.10"; sha256="1i0v8v5sdc9dwwljgnv3365sxyshp9dqbmamr3fa5gmhsjly3zs2"; depends=[knitr]; };
+  rje = derive2 { name="rje"; version="1.10.13"; sha256="08s8pw0v49z504y529yhyhp3gj1836fpxmbfhb01ka7kbj8v6swk"; depends=[knitr]; };
   rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; 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]; };
@@ -12719,7 +12726,7 @@ in with self; {
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
   rlang = derive2 { name="rlang"; version="0.4.2"; sha256="0fczcp17kaz3s4p0nd4126bppwl20vpxfybhsndpcky9h75wklgv"; depends=[]; };
   rlas = derive2 { name="rlas"; version="1.3.4"; sha256="0ccdbg634ibdjh1c7bri4l6achfrb4agy4iilr4z1pc1yzgsnk6r"; depends=[BH data_table Rcpp]; };
-  rlc = derive2 { name="rlc"; version="0.1.0"; sha256="1f0ibhnj43aalks7z9w2sbnqwccjvff1lbkkykr5fqllybnsn05r"; depends=[httpuv hwriter jrc jsonlite plyr stringr]; };
+  rlc = derive2 { name="rlc"; version="0.2.0"; sha256="083pkajxshckk3hqg7q87jdmiqg9a1jp5lwar6f5r4nqna4kf3xa"; depends=[hwriter jrc jsonlite plyr R6 stringr]; };
   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-5"; sha256="09mniai7v8gapr6hd3zm8sm3vi1zcyhgym389904ykb2yx7l68s7"; depends=[]; };
@@ -12736,35 +12743,34 @@ in with self; {
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; };
   rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; };
-  rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
+  rmapshaper = derive2 { name="rmapshaper"; version="0.4.2"; sha256="1m0zb5vh4mph5lz5c5rdjl3clk7rih0ipf31a91cv308fvxhlrvi"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
   rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.18"; sha256="0fykzbb5kjsqc8v6gjcdma7rmq0gailp30qij6plgna4d8nhjw3w"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="2.1"; sha256="0pa5xs0vzwn9vsgysjqbks9v5lbqphxh5agciskllibc40hhwigg"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.3.0"; sha256="0mvrf6d2pfdvsgfgwkkb7k7q367k5i71wbq96gjhfimxr2lxwf7f"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.3.1"; sha256="1y59r4n2ywinfpkb7zn7gygl97w6p0rvr90sjqy4vdhi60ka16kf"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
-  rmd = derive2 { name="rmd"; version="0.1.4"; sha256="01ib000hq6acklvysdxnyjmlypnxznsk0zymj1f6vs9vwh711f00"; depends=[blogdown bookdown bookdownplus citr cli crayon curl devtools dplyr DT magrittr mindr miniUI pagedown purrr rappdirs rmarkdown rstudioapi rticles rvest shiny shinyjs tibble tinytex xaringan xml2]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
   rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; };
   rmdcev = derive2 { name="rmdcev"; version="1.1.1"; sha256="0pz60hzd3gvmrzcb29h0h4zb4lr5sdyw3nsa84hixsph00cf4lm0"; depends=[BH dplyr Formula purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidyr tidyselect tmvtnorm]; };
-  rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.0"; sha256="05hr6lrlsdp8g9y41g3zz875x9gg1533as95krb37ywp3rr4p819"; depends=[assertthat rmarkdown]; };
-  rmdformats = derive2 { name="rmdformats"; version="0.3.5"; sha256="16ncawidfkkzh67ak6043kg504glli5g9npfg7vsrw168r7mmyci"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
-  rmdplugr = derive2 { name="rmdplugr"; version="0.4.0"; sha256="10xwaxjhrkkinahv9n29br0znkfvbyvx7yjva7ycrlibndm55bxq"; depends=[bookdown rmarkdown]; };
+  rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.2"; sha256="1hj4lhwyz47hznyqjgghp852fkzhk5k7dfp7cxabg8h49qzswcgx"; depends=[assertthat rmarkdown]; };
+  rmdformats = derive2 { name="rmdformats"; version="0.3.6"; sha256="157811frmm1f7d7r27wr7f71frggm664w1diymw1kd88wgw3z89r"; depends=[bookdown htmltools knitr rmarkdown]; };
+  rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown 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-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; 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]; };
-  rmio = derive2 { name="rmio"; version="0.1.2"; sha256="0lhfwjmi5s7ysm4jrb0r18cm3sdcswdrsx9kps4dv7v2yab4jkvx"; depends=[]; };
+  rminer = derive2 { name="rminer"; version="1.4.3"; sha256="0x9lzzhhy5zld8fajf4aq1msvck2kg3hvkpaiw4lx7w14znda7kd"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
+  rmio = derive2 { name="rmio"; version="0.1.3"; sha256="0zd8kki9wmh4xnabf7nwjw66wb4x5wngn0073pzqcj84ggxgnwqc"; depends=[]; };
   rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; };
   rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; };
   rms = derive2 { name="rms"; version="5.1-4"; sha256="19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q"; 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.2.1-6"; sha256="1a0y4iaq2697z34b8jr9pm12n4qa5knxb1q995bli50pygz8zyl8"; depends=[Rcpp]; };
+  rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.3"; sha256="0dn39d8kjkk808zjhb6npl7igmbp3j5q15z70f59g9j6xwm9dvnz"; depends=[dplyr magrittr PerformanceAnalytics purrr readr tbl2xts xts zoo]; };
+  rmumps = derive2 { name="rmumps"; version="5.2.1-7"; sha256="0gnsynhlxh6pbhi1gr3zdi5y1gbbhbcp50z7y9b97px4j3hwignf"; depends=[Rcpp]; };
   rmutil = derive2 { name="rmutil"; version="1.1.3"; sha256="1nl20nyahnm55z41d096ni9iqhn19ab98i9c13ja1i6ik4gg9fks"; depends=[]; };
   rmweather = derive2 { name="rmweather"; version="0.1.3"; sha256="1qdf511vmpffrdfcxlll54km2s0pf6pdswj8401k4ymv5iif91hl"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; };
   rmytarget = derive2 { name="rmytarget"; version="2.1.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; };
@@ -12777,7 +12783,7 @@ in with self; {
   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=[]; };
-  rngWELL = derive2 { name="rngWELL"; version="0.10-5"; sha256="0b4ys525gksgqwqx9id4bdgyi9mwj6n3r87xdzf4fc9hp3cc16jb"; depends=[]; };
+  rngWELL = derive2 { name="rngWELL"; version="0.10-6"; sha256="0pjjcs9pqj7mf0mhb2cwd0aanqpwnm65bm86hk6mi2vw8rgnj2vv"; depends=[]; };
   rngtools = derive2 { name="rngtools"; version="1.4"; sha256="1kivj594bn774lbn29ws2rmzy2km99sza0j3jqvhal6hwmk27a9s"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
   rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; };
@@ -12787,7 +12793,7 @@ in with self; {
   rnrfa = derive2 { name="rnrfa"; version="2.0.1"; sha256="1p7wc3czp0i6il16nc1syp51i5gnb1hjx32j35ms8v20ficyb1zp"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble xts]; };
   roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; 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.1.0"; sha256="17kpl35lynm1fwsl8ljwl6yjph1fps8vk2m8qxsx0x64wwfvccim"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC tidyr VIM zCompositions]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.2.0"; sha256="093lg17i8f94prai6mzwl70w3iy40hda6311mq9sirspr77nz3ni"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; };
   robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; };
   robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
@@ -12804,11 +12810,11 @@ in with self; {
   robregcc = derive2 { name="robregcc"; version="1.0"; sha256="159ms69jqjkf8bhi4hkm929hpwqi8qbcfyaahcjlkyximv7qnqaz"; depends=[magrittr MASS Rcpp RcppArmadillo]; };
   robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; };
   robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; };
-  robust = derive2 { name="robust"; version="0.4-18.1"; sha256="0xs098pfw5zdcdk3rsxkylfl6d2pyp566s5v92bzhgl7h8c90cfy"; depends=[fit_models lattice MASS robustbase rrcov]; };
+  robust = derive2 { name="robust"; version="0.4-18.2"; sha256="02x7d6dgx3skiadvx5m3c44b4bhz37ycpfhc25dhhv50y1db6l3k"; depends=[fit_models lattice MASS robustbase rrcov]; };
   robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; };
   robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
   robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; };
-  robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
+  robustHD = derive2 { name="robustHD"; version="0.6.1"; sha256="0h2kdw8xkyflczwfq48cfdal0ccvil8dsq4xpnw7qfmjyvkycnxp"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustSingleCell = derive2 { name="robustSingleCell"; version="0.1.1"; sha256="1rxjw5rwp20ssjgq26ajrbipqfjblmsgf87jgx7xa41mgmhwaq51"; depends=[biomaRt cccd dplyr GGally ggplot2 ggpubr ggrepel gplots igraph limma Matrix RANN RColorBrewer Rcpp reshape2 rslurm Rtsne scales]; };
   robustX = derive2 { name="robustX"; version="1.2-4"; sha256="02476pl6gnv1sgp5qywlm79gkaxlghms2c1arj4b16r0gz0g230r"; depends=[robustbase]; };
   robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; };
@@ -12823,7 +12829,7 @@ in with self; {
   robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; };
   robvis = derive2 { name="robvis"; version="0.3.0"; sha256="0xzvx3230ydd082jmdlm70vyhjizknngfzhvcbqpdcm403klni5h"; depends=[ggplot2 scales tidyr]; };
   rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; };
-  rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
+  rocc = derive2 { name="rocc"; version="1.3"; sha256="1j15l28c7kv7x850ycjprqi5gpbsl6wfv97h9lbrx11q5l4r9ivb"; depends=[ROCR]; };
   roccv = derive2 { name="roccv"; version="1.2"; sha256="18kq2gzcbz97dw168xppql8k3slpkfl8yv1d8ac48damlhvipif1"; depends=[glmnet pROC]; };
   rock = derive2 { name="rock"; version="0.1.0"; sha256="0plyn9n3ngbdakdv98ywakr5xgkwqkwspla3pdmsi6w12zsvkak8"; depends=[data_tree DiagrammeR dplyr glue purrr yum]; };
   rockchalk = derive2 { name="rockchalk"; version="1.8.144"; sha256="07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb"; depends=[carData kutils lme4 MASS]; };
@@ -12832,7 +12838,7 @@ in with self; {
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
   rodeo = derive2 { name="rodeo"; version="0.7.5"; sha256="0825py3a41ccbd1dplkv1hci11wcp0ai5m37489cjg4gqaka7qgn"; 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.1.3"; sha256="1fhxsvxhvf7m01n1fyyq9pc65w16wpw76ww4l538m9m54g49xs8g"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  roll = derive2 { name="roll"; version="1.1.4"; sha256="1f0z12bp71sgjj6im7cca8bxkm5x6z1y4fcspmpdw6dc2hli36zx"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   rollRegres = derive2 { name="rollRegres"; version="0.1.3"; sha256="1rf6hdbndindq6kr5yzyqq4jy1c11shfdvjb8mwm957dd0kbs3rx"; depends=[checkmate Rcpp RcppArmadillo]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
   rolldown = derive2 { name="rolldown"; version="0.1"; sha256="1awr8lcxz7y9mjhia4p85jvixc72gj525gk2jjl13njgq6shp0b5"; depends=[bookdown htmltools jsonlite]; };
@@ -12841,12 +12847,12 @@ in with self; {
   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.8.1"; sha256="0skrspq7sd7gaq73w91km14v8znc8chncgy64hvjgcng2xw15phx"; depends=[]; };
+  rootSolve = derive2 { name="rootSolve"; version="1.8.2"; sha256="0rj7c4zcrzgz7sb0vgvh7swpfafnw4040cxp7ypas3s8fnihn54l"; depends=[]; };
   rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; };
   roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
   ropenaq = derive2 { name="ropenaq"; version="0.2.7"; sha256="161yc2d82iivxaqpl5kzvxcmcqjpv6s5jj9pa304vj8cz0rnxgfr"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
-  ropenblas = derive2 { name="ropenblas"; version="0.1.0"; sha256="1lbdkiagbgpdj7zvy7vszbwh7zdz2bfcmjgj4hi3lry9qq9k6w1a"; depends=[fs getPass git2r glue magrittr rstudioapi stringr]; };
+  ropenblas = derive2 { name="ropenblas"; version="0.2.0"; sha256="0bz0q4qw1ivr7l37vsrcimrndgww3ay9dbk2ga3fxhnz50yq6kxr"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; };
   ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; };
@@ -12860,12 +12866,11 @@ in with self; {
   rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; };
   rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
   rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
-  rosr = derive2 { name="rosr"; version="0.0.8"; sha256="1v1lllqim6m6c2j3s7zgd9nxbxja719995lqlawijifrksrkncds"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; };
   rotasym = derive2 { name="rotasym"; version="1.0-6"; sha256="134gpkcryqy4kwnm89d0ihzx4s7m7bs1wypq6mp2ajdnn8qh6zv1"; depends=[Rcpp RcppArmadillo]; };
   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.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
-  rotor = derive2 { name="rotor"; version="0.2.3"; sha256="1gydvlaby84mw5av6sgv6lsvzp2p4znc3mqsdv5gdx1l2sngfmcm"; depends=[dint R6]; };
+  rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; };
   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.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
@@ -12873,9 +12878,10 @@ in with self; {
   roxygen2 = derive2 { name="roxygen2"; version="7.0.2"; sha256="162xag27hwwyadfwm5zpyy15nxwhw2vbhwapx3jmi9cfyryr68sq"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp rlang stringi stringr xml2]; };
   roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
-  rpact = derive2 { name="rpact"; version="2.0.5"; sha256="0mj4l1sdwqbxccsailx2b252qswq92kjl7cq0b2s5c41jxjc97k4"; depends=[Rcpp]; };
+  rpact = derive2 { name="rpact"; version="2.0.6"; sha256="09ikjcvz6jisbl387j5idypwxqn2ir55cq8f19klwc0p0d113wg4"; depends=[Rcpp]; };
   rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; };
+  rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.0"; sha256="07mp3gi15h3d5vs27nx2d5nawms3fly2mcqvkr2vb8aq6m377p3b"; depends=[Rcpp rpart]; };
   rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; 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]; };
@@ -12893,14 +12899,14 @@ in with self; {
   rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; };
   rplos = derive2 { name="rplos"; version="0.8.6"; sha256="1i5dzlv57bpddf9qsnq0azc0fsbmzqz9bkrijabp2qwxg0w76mcx"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; };
   rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; };
-  rpmodel = derive2 { name="rpmodel"; version="1.0.2"; sha256="0daldm91lmmk6ivsj3rknn60w5fa9wakrnxxp77xm88bf1fr5yda"; depends=[rlang]; };
+  rpmodel = derive2 { name="rpmodel"; version="1.0.4"; sha256="1rbygxk6dbi3pqxri5myc7f3y04haa0slpiaa330malg3dw5a9gc"; depends=[rlang]; };
   rpms = derive2 { name="rpms"; version="0.4.0"; sha256="10zw0xln0vjrzrilyn67nnw13aadnskzca1930fvb483c691bm36"; depends=[Rcpp RcppArmadillo]; };
   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.3"; sha256="04x5qdz0kznxnp9kygp0m2rjxyhqfz3mc81mcr4aw6cy5p4zp9aq"; 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]; };
   rpql = derive2 { name="rpql"; version="0.7"; sha256="18llgwk1jfwf3y1dabpc508kfb1k4yh4cr4k76azkziv11arbh0c"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
-  rprev = derive2 { name="rprev"; version="1.0.2"; sha256="0gdragdnakq9476df116viw8nyv0iahsfm1a3insv01j8x1y5l8c"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; };
+  rprev = derive2 { name="rprev"; version="1.0.3"; sha256="14jc0bszb3cqfqqx5sdvfb3bddrxsifmf97x7cj1lg6pm85wdpvi"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; };
   rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
   rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; };
   rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; };
@@ -12909,18 +12915,18 @@ in with self; {
   rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
   rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; 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.1"; sha256="195s2l60llw2hb5abykydajadzg44700j5kahkw57413hh86qrh0"; depends=[quantreg regpro]; };
-  rqdatatable = derive2 { name="rqdatatable"; version="1.2.4"; sha256="01q4pzipn3kbbbb9fika5n727rbjca66mldfh0kn5gx8mlsf08ny"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="1.4.0"; sha256="0dnbdi9fn5r2s2p0f9z1qnszxnbbsvwgnbql5awrk5zjbajybxgy"; depends=[wrapr]; };
+  rqPen = derive2 { name="rqPen"; version="2.2"; sha256="0zfsrxavyd65x35vg8vwv0fy07b1byf189avxidwfypxm0vr1x8y"; depends=[quantreg regpro]; };
+  rqdatatable = derive2 { name="rqdatatable"; version="1.2.5"; sha256="1w4ljwz5lzgry1sn2wgbzccm0d5v49dwdljqw4kamynw1nqi7pby"; depends=[data_table rquery wrapr]; };
+  rquery = derive2 { name="rquery"; version="1.4.2"; sha256="0l4747d2kcalq9c5ks18np0qsg7qbvqz0x7nrgh2mi2m9k0jb2rb"; depends=[wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; };
-  rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
+  rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; };
   rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; };
   rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; };
-  rrcov = derive2 { name="rrcov"; version="1.4-9"; sha256="11zvxidlb1pr2j5dzvmbjqdgsmmicsq8ppjf5wcfykfyf2fkcmz7"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
-  rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
+  rrcov = derive2 { name="rrcov"; version="1.5-2"; sha256="0m62k58nabw7hjz1qyyf9a0d6lvcz5vcvpksjnq93zcfra9inr57"; depends=[lattice mvtnorm pcaPP robustbase]; };
+  rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; };
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-6"; sha256="03dr42np7a0yl3hi2iz4xp5b6yrazx6vlsjrby6fcn9r8y1fmac9"; depends=[pcaPP pls Rcpp robustbase robustHD rrcov spls]; };
-  rrcovNA = derive2 { name="rrcovNA"; version="0.4-13"; sha256="1nq37iaay2w7y573ni5dgi4vzx5rnzibjimb97k6gzn3si6r68g9"; depends=[cluster lattice norm robustbase rrcov]; };
+  rrcovNA = derive2 { name="rrcovNA"; version="0.4-15"; sha256="0r60chxm7bpc6sis60rp8k8xchwfrfa3lrfaidvv22ipx2q0psp7"; depends=[cluster lattice norm robustbase rrcov]; };
   rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; };
   rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
@@ -12945,10 +12951,10 @@ in with self; {
   rscala = derive2 { name="rscala"; version="3.2.16"; sha256="0c07lq3qhg4h5n0g0s1i11q5jrlijvidrdy3h1ln262mn2wqn8az"; depends=[]; };
   rscielo = derive2 { name="rscielo"; version="1.0.0"; sha256="005nmi18831a2krl2xhj74ya9mfjq8zzccjafnfxha89x8ygxsa3"; depends=[dplyr httr magrittr purrr rvest stringr tibble xml2]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.8.15"; sha256="018cdbcxlbvqpwzv0qxvvz8yhl0d6gcavpbk1m5fyrgpvys1brri"; depends=[curl jsonlite openssl packrat rstudioapi yaml]; };
+  rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; };
   rscontract = derive2 { name="rscontract"; version="0.1.0"; sha256="0hhhndvrk9z6izdq4vh95bi9879k0svgpmhajrnm20xc5sb136jf"; depends=[]; };
   rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.13.0"; sha256="1iahfdgjslcnhm24ynvyzdvlrkdkjy1s6hhxqaqc56wprd5bhx27"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
@@ -12964,7 +12970,7 @@ in with self; {
   rslurm = derive2 { name="rslurm"; version="0.5.0"; sha256="0dpxglcsqa2k0nak10515ga13c46rb4mrbpbr3gv7xckg6347zqg"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; };
   rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; };
-  rsoi = derive2 { name="rsoi"; version="0.5.0"; sha256="0y7883b4zw95rhndxl66ji513a1m4riacbkbvd1bzkzq4jb3a8fc"; depends=[curl]; };
+  rsoi = derive2 { name="rsoi"; version="0.5.1"; sha256="17b78m3m0n191xbds70zvpwk27xw70phm66p6i26smc1zwg94y89"; depends=[curl memoise]; };
   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.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; };
   rsparkling = derive2 { name="rsparkling"; version="0.2.18"; sha256="0lhq9jxxib2krl298hy3sglh5lm5lyibknigpbxx68pn71jwp1hm"; depends=[h2o sparklyr]; };
@@ -12978,7 +12984,7 @@ in with self; {
   rstanemax = derive2 { name="rstanemax"; version="0.1.1"; sha256="0yvinnz0ybrarl1p36ibaiflava1hhdnh4avjgc5iq0b3nr6x42g"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; };
   rstantools = derive2 { name="rstantools"; version="2.0.0"; sha256="1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa"; depends=[desc Rcpp]; };
   rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; };
-  rstatix = derive2 { name="rstatix"; version="0.3.0"; sha256="0rg1wfvjap09x0lc4hfiwsdk0ghldiy33lb97i9w5xs4napkj04d"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
+  rstatix = derive2 { name="rstatix"; version="0.3.1"; sha256="0iiv0l3rm5b2y018hm65n4385iq9ixwj4qgf1n4f71y0hl36bg91"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; };
@@ -12997,41 +13003,41 @@ in with self; {
   rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
   rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
   rtf = derive2 { name="rtf"; version="0.4-14"; sha256="1v4vb2ijqlbqcjqdhf85kfzs67whkhm6ygp5cw8xa6qw179vkgd5"; depends=[R_methodsS3 R_oo]; };
-  rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; };
-  rticles = derive2 { name="rticles"; version="0.12"; sha256="1zc8cpm3621a9qnwa15clqkn3qf2n55xrj1ncpz6gmcqkw2gxs0g"; depends=[knitr rmarkdown tinytex xfun yaml]; };
+  rtfbs = derive2 { name="rtfbs"; version="0.3.15"; sha256="1447wjdjcc18sj6ngh22zfc50jk8zshdgkwp1d7ba4n5qsj7b2fl"; depends=[rphast]; };
+  rticles = derive2 { name="rticles"; version="0.13"; sha256="0di9vdvz4kcdzahghbc77wpgb00c8lb3fjdsn1jrnr4whznl5fiq"; 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.7"; sha256="0l0chjbn8kipnhi37zshphxmxga6id39rm5gzz5gjrv8bnaaxxqb"; depends=[pixmap]; };
-  rtika = derive2 { name="rtika"; version="1.22"; sha256="1vlv2v7s7p6plahph1wvki68ssyqq8l49brj3pp3r0cnz082askl"; depends=[curl digest rappdirs sys]; };
+  rtika = derive2 { name="rtika"; version="1.23"; sha256="0m27vv4jb39lqnv0cnx6wznn3h8ia2if0np670wf1345v9i4ygyh"; depends=[curl digest rappdirs sys]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate 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.7"; sha256="0h2664z7rbpj0zqnixb5swkkpjbbsgiagmd6dl92k10zphw0c8i0"; depends=[Rcpp]; };
+  rtk = derive2 { name="rtk"; version="0.2.5.8"; sha256="1ybppi5h86gb324hlkx91m2kk2dw7hi5k5l2fh5h1xnlqjv55n0b"; depends=[Rcpp]; };
   rtkore = derive2 { name="rtkore"; version="1.5.5"; sha256="0srk0ih4gbmhb1pl6zf8sjwrkdmgws9cl1397fcqv6l3bc376622"; depends=[inline Rcpp]; };
   rtmpt = derive2 { name="rtmpt"; version="0.1-17"; sha256="0hp4hia8fp9kbs25hgbjv2nr3h0lkn4v4b0j0c4a9bfm2mrvy0l9"; depends=[coda data_table LaplacesDemon loo stringr truncnorm]; };
   rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; };
-  rtrek = derive2 { name="rtrek"; version="0.2.5"; sha256="0b7j0y20damrzih3ibj4jf7gpa0sjqqxh31h9cs6r41mn5m7pyj2"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; };
+  rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrim = derive2 { name="rtrim"; version="2.0.6"; sha256="18fvi8zbf9dqwi5x0sgy2aay5565ldvqpispqqb5gx2lwb9qra2r"; depends=[]; };
   rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; 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.1"; sha256="0dkv8pl2937zfpcwyy9ms1ak29nv9mxyb8w6bh2ns8figjp11zmp"; depends=[quantmod RColorBrewer xts zoo]; };
-  rtweet = derive2 { name="rtweet"; version="0.6.9"; sha256="17i8dfcyggr47jm73p6qll9nyxsnr2mmcrpwf65xw3f30c9kmjig"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; };
+  rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
   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.3.0"; sha256="18sivq5ilq14mqs62vh6l24fcayvd7ffdbva94ir6n0gx9axmm22"; depends=[dplyr gtools magrittr Rcpp RcppParallel 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-1"; sha256="05dlzrv9ahfwqq5bmd9vk13zvzwgf1zyq65kp3qf94v9sp5xr5kx"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
-  ruimtehol = derive2 { name="ruimtehol"; version="0.2.1"; sha256="1xdqpk6vps29p0y8cvs2j563b776jmj6nqcq3pabff80rlmfli1h"; depends=[BH Rcpp]; };
+  ruimtehol = derive2 { name="ruimtehol"; version="0.2.3"; sha256="073qb7g9j6zkk6hxf78y7ymnmc1s4hbjxxlymjhxpvjfbg4xpslw"; depends=[BH Rcpp]; };
   ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; };
   ruler = derive2 { name="ruler"; version="0.2.1"; sha256="01b5qn6b69hhl9df6sr187w16z5hj6vxb8yi77y2rghkcrnm12i9"; depends=[dplyr keyholder rlang tibble tidyr]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
-  runjags = derive2 { name="runjags"; version="2.0.4-4"; sha256="0wqc3kmilvn3szyqvwrvqlins6smpvwv2fj80yflxcr553kph7xd"; depends=[coda lattice]; };
-  runner = derive2 { name="runner"; version="0.2.3"; sha256="1vnq8lchsffdi8bwi9bv4n6aw2ha1gykwsm0wrm2nhsfp7i1y164"; depends=[Rcpp]; };
+  runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; };
+  runner = derive2 { name="runner"; version="0.3.1"; sha256="0dxg4s5cldh112bk65ymj2ir2zi7n47rs72zcwr9abp65hlg32gf"; depends=[Rcpp]; };
   runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; };
   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.7"; sha256="0d92vqm7hvdwy0glsjg7l1w324zmnq1igypb7f2ymsj7bls0h61d"; depends=[Rcpp RcppArmadillo spatstat]; };
+  rust = derive2 { name="rust"; version="1.3.8"; sha256="05xqvbkjckwxmhgcl9dqb7y20jq8b6f2fad5dikvbq5l8pwfygxj"; depends=[Rcpp RcppArmadillo]; };
   ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; };
   ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; };
   rv = derive2 { name="rv"; version="2.3.3"; sha256="1h5lhy87v88b70a7pbq5xirskm6ih9fk90n6mzp1nmkr7w1d3zai"; depends=[]; };
@@ -13039,30 +13045,31 @@ in with self; {
   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.7"; sha256="1a3xlzi4n1rqiapfa180aif7n7nws8pbg8k3nk7ccaczvmni38aw"; depends=[BiocManager rlang]; };
-  rversions = derive2 { name="rversions"; version="2.0.0"; sha256="0mkg9zrjxlbwqzijiysivrs523x48syqj30xdfp88clpkqfk435m"; depends=[curl xml2]; };
+  rversions = derive2 { name="rversions"; version="2.0.1"; sha256="1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i"; 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.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; };
   rvg = derive2 { name="rvg"; version="0.2.2"; sha256="0f74ja8frkfgb5hhsdydirn7v6hhylmq5wbay9p0z2ac16xrslrd"; depends=[gdtools officer Rcpp rlang xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
   rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; };
   rvinecopulib = derive2 { name="rvinecopulib"; version="0.5.1.1.0"; sha256="1616xqchjyqqf2nmgx5rlpnw8g4696lvlpmrx7jav2cnvkff7s2i"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; };
-  rvkstat = derive2 { name="rvkstat"; version="2.6.2"; sha256="11jaxmf24rkzmymx5dvfjbw2i6lxw4n4g4f83kpjf2768cvscyp2"; depends=[httr jsonlite RCurl tidyr]; };
-  rwalkr = derive2 { name="rwalkr"; version="0.5.0"; sha256="1sf3f072j8lywik0j8dhnpd34svlv2j4j47nvyym9ykw4w4apm2a"; depends=[dplyr hms httr tidyr]; };
+  rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; };
+  rwalkr = derive2 { name="rwalkr"; version="0.5.1"; sha256="1436qdwx1i8868wj45xdrr79bvsf9qaf5msjc778qlmvyyyswxh7"; depends=[dplyr hms httr tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
   rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; };
   rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; };
   rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
-  rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.0"; sha256="124jy73nb9w5gwzg6007nffgvmii8528vn93pqqh8q78ays198qq"; depends=[dplyr rlang stringi tibble tidytext]; };
+  rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.1"; sha256="1lwa8x2a2k7vspll4k8g7l09cvpxxnpv2476x50fzvn126881g5i"; depends=[stringi tibble]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
+  rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; };
   rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
   rwty = derive2 { name="rwty"; version="1.0.2"; sha256="0p0bpq5dk8vjqx8ry364xhaq3rgxa49planapggicg7by2mhaacc"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; };
   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.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; };
   ryandexdirect = derive2 { name="ryandexdirect"; version="3.2.2"; sha256="0ga6kx4mpd1dw6b8nbnmc7cly7kcmkplldgdy6jaiz3jmsiy2vgn"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; };
-  rym = derive2 { name="rym"; version="0.5.2"; sha256="1j69fmc0wgj8w5y68ix13kh3rsc4blmyc9hsmp41crgr10mi3nvi"; depends=[httr stringr]; };
+  rym = derive2 { name="rym"; version="0.5.4"; sha256="1lsxzb6j5bxcrk8dv6wvvbjcfpb6zp9afbdyp0lzm348z953f44z"; 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]; };
   rzeit2 = derive2 { name="rzeit2"; version="0.2.3"; sha256="0fvkpc6l57s64m0zx8fzazvyhpn5wxa1cb185h20x8hjf069i5lf"; depends=[anytime httr jsonlite openssl rvest stringr xml2]; };
@@ -13070,6 +13077,7 @@ in with self; {
   s2 = derive2 { name="s2"; version="0.4-2"; sha256="17r3xn2ldlz7qpdwrp0mdm7pfrdfwibyv8biaxq4b6qx0p7wvw6n"; depends=[Rcpp]; };
   s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.6"; sha256="1nvmc3mpdqrcnv17vk8rjd7mh55pj68y2ffiia09lc8h84r3zxil"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
+  s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
   sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; };
   sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
@@ -13093,22 +13101,22 @@ in with self; {
   sae2 = derive2 { name="sae2"; version="1.0-1"; sha256="0cnqlacglwyx4cdm3wl3j3g2xv2sx3921mnzk2v0bk704i9y7qq3"; depends=[MASS survey]; };
   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.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
-  saemix = derive2 { name="saemix"; version="2.2"; sha256="1gp9xww9q3cq9dr6nifp4wlyg9gmamab845py1ag07vnr2gfwx5c"; depends=[]; };
+  saemix = derive2 { name="saemix"; version="2.3"; sha256="08n1syv8wkf1nqz8i1n3ippyp63g56xf8xqgczxm630r6802yqab"; 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.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; };
-  safetyGraphics = derive2 { name="safetyGraphics"; version="1.0.0"; sha256="0vkl31bwh2ishijby2xhp5jcnjxzvy6bsv83f3cfpv4qcw4wbd4k"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinyjs shinyWidgets stringr tibble tidyr]; };
+  safetyGraphics = derive2 { name="safetyGraphics"; version="1.1.0"; sha256="1s8xwx014nihn13v6rpwy11sb3yzfyj3alb88y47wp1kh39d7f0q"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinybusy shinyjs shinyWidgets stringr tibble tidyr]; };
+  sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; };
   salesforcer = derive2 { name="salesforcer"; version="0.1.3"; sha256="1nhw7l6bg375dqqcaxjfvhjm9sb1jsil5wayhffdxc9lqdxrd5a2"; depends=[data_table dplyr httr jsonlite lubridate purrr readr XML xml2]; };
-  salso = derive2 { name="salso"; version="0.1.9"; sha256="1an0viw8j1mnafc16hdgiynnaxxvwi3nf4pwaig5zagpzg4kl6im"; depends=[]; };
+  salso = derive2 { name="salso"; version="0.1.11"; sha256="1rxfnh575hl3zpsm3r0mscfr0hy9v2kss142ggzrz49a4kskpa1x"; depends=[]; };
   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]; };
-  samc = derive2 { name="samc"; version="1.0.3"; sha256="1jhlxyh1h4p29axrpncpjhqxaziybf8hpfa52nxgnif0c9hwjn4b"; depends=[gdistance Matrix raster Rcpp RcppEigen]; };
-  samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
+  samc = derive2 { name="samc"; version="1.0.4"; sha256="03n49p2cjs1r3grmg4cw4pxn4lddx5084j4j8dj0g6l9sjzj64hz"; depends=[gdistance Matrix raster Rcpp RcppEigen]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
   sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
-  samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.7.5.1"; sha256="01d42sj5sq95h14hdkrq4191pn66c3hhmymqvgl90mrpbcgzk5bw"; depends=[TeachingSampling timeDate]; };
+  samplesize4surveys = derive2 { name="samplesize4surveys"; version="4.1.1"; sha256="0v332xb4vkkjr3nwf3231aqgzsj7mqld9ffkla1nj52lxay2ji75"; depends=[dplyr magrittr 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]; };
@@ -13123,22 +13131,22 @@ in with self; {
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; };
   sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; };
-  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]; };
+  sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; };
   saotd = derive2 { name="saotd"; version="0.2.0"; sha256="1rhkhsnmh3nf7y0x5sl3mmr5mismz8m92gj0v12niysalcywiarh"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr maps plyr purrr reshape2 scales stringr tidyr tidytext topicmodels twitteR widyr]; };
   sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; };
   sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.0.7"; sha256="0lnhg4apsvvyzyz89x778nhxjp4y0mycgajxjyb57wcwgn16gygm"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; };
-  saqgetr = derive2 { name="saqgetr"; version="0.1.17"; sha256="0ba005pv6iswv0q3jg6h7dh6j1c318c53sndjwaibqxnmy8by7mb"; depends=[dplyr fs lubridate magrittr purrr readr stringr tidyr]; };
+  saqgetr = derive2 { name="saqgetr"; version="0.1.19"; sha256="0sl0kngcsadgnx1lwhgbn9w4885dv0ih3c5vkvmz0bkvhdcjih9j"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; };
   sarima = derive2 { name="sarima"; version="0.8.1"; sha256="03261mqv4l8wkan0phg7085qsy9q1vhhyx6bfnygjva7vvxafvpc"; depends=[dplyr FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; };
-  sars = derive2 { name="sars"; version="1.2.0"; sha256="03pqdnfchin541fb5awb5i5xl8ryh382wh898hxgxi05qaz1cv07"; depends=[cli crayon dplyr nortest numDeriv]; };
+  sars = derive2 { name="sars"; version="1.2.1"; sha256="10j2cz66qpdicarxy2mx2hlmkvby3j83qrjm2irmfnwmscafg5f4"; 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]; };
   sass = derive2 { name="sass"; version="0.1.2.1"; sha256="02a5n0l8wya5v1iq2rb4hvc0gm23790jnjl7i3pzw2b5vkqd3l7s"; depends=[digest]; };
-  satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; depends=[plyr raster Rcpp]; };
+  satellite = derive2 { name="satellite"; version="1.0.2"; sha256="1ib9g4cplksf9ymp8hcv843lv5bpar31w8h4wnmya5hjsdmlfiv4"; depends=[plyr raster Rcpp]; };
   satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
   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]; };
+  saws = derive2 { name="saws"; version="0.9-6.2"; sha256="1ikvky45inz65djv1c9v749a5lq4m0xlzhm4p12am25qyv08hgjz"; depends=[gee]; };
   sazedR = derive2 { name="sazedR"; version="2.0.1"; sha256="1y8vlffvw7ff6j6pqwd0r2zxx1an846znajgcl8mdcbjimvf7fg5"; depends=[bspec dplyr fftwtools pracma zoo]; };
   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=[]; };
@@ -13148,13 +13156,16 @@ in with self; {
   sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; 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.9"; sha256="0azk4sa2h60yyfnskcicpiaqb3wrw0x64drb2z38y5k4jrrjbmlq"; depends=[curl httr jsonlite stringr]; };
+  sbw = derive2 { name="sbw"; version="1.0"; sha256="07lr2sh681q0wvyaf7ixif5riw9kfxv4hraxj8hzqaxcsip743vq"; depends=[MASS Matrix quadprog slam spatstat]; };
   scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; };
   scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; };
   scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; };
   scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; };
+  scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.1.0"; sha256="1qfmrrpvrxpj9mmhyhr8f99iiz3y1l8iz2hff3wgl9jx80nnhr67"; depends=[MASS Matrix pbapply reticulate RSpectra rTensor]; };
   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]; };
+  scaleboot = derive2 { name="scaleboot"; version="1.0-1"; sha256="1q0bs5f1vgja5gj3id1ny6raja8ljgd8dk50fs1wn90f6080afy7"; depends=[mvtnorm pvclust]; };
   scales = derive2 { name="scales"; version="1.1.0"; sha256="00rdbfj5mwc3kr8pskidn3n2zkp4ms6cx36xazz54pxw3pysdr0y"; depends=[farver labeling lifecycle munsell R6 RColorBrewer 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.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; };
@@ -13178,6 +13189,7 @@ in with self; {
   schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; };
   scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; };
   schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
+  schrute = derive2 { name="schrute"; version="0.1.1"; sha256="1mwlxmwc8bnjihz4l30vkzx1lm36x0dfgzx0j64kfdp1xdbbq3ma"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; };
   schumaker = derive2 { name="schumaker"; version="1.2"; sha256="1whfmnjmib7lh72src7cnbw3mswzaxq8vd50x5x9cv0031n0y6l7"; depends=[]; };
   scico = derive2 { name="scico"; version="1.1.0"; sha256="0c52a4mhsd9y5vhz3h6f7j2fa5cq0lkks5qa449w6kra5cqpbx34"; depends=[]; };
   scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; };
@@ -13191,7 +13203,7 @@ in with self; {
   scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; };
   scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; 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.2.7"; sha256="1fp7qd1wy0ki0wwsa2ir0wyqrwjvq5g0b023c5gvzs5y6k7hg4jj"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; };
+  scorecard = derive2 { name="scorecard"; version="0.2.8.1"; sha256="0h10glghqlk4nihpy41h89rm9db3lwq1pwdyg8vrx508n9k1bv7r"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; };
   scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; };
   scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
@@ -13211,7 +13223,7 @@ in with self; {
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
   scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; };
   scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; };
-  sctransform = derive2 { name="sctransform"; version="0.2.0"; sha256="1r5kiqqs318q59h2i8m7c6nhghp9w6q26ss2y5a390lkhsawgx6p"; depends=[future future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; };
+  sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; };
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
   sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; };
   sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; };
@@ -13225,7 +13237,7 @@ in with self; {
   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-67"; sha256="081p1k4yd2plvjswbnq3w5xmzlxs1khkm7nvzdcr0xhdwjinb3vm"; depends=[raster sp]; };
+  sdm = derive2 { name="sdm"; version="1.0-81"; sha256="1fig0vsz4l7kgrdil9jzln1vaff18xx08i5069j40ra04rzadfdi"; depends=[raster sp]; };
   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.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; };
@@ -13236,6 +13248,7 @@ in with self; {
   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.12"; sha256="1gb7ma2qpw8vnwfblwhalagar1cjqfd4la61bw652kk28v98y9bs"; depends=[gsw oce]; };
+  seagull = derive2 { name="seagull"; version="1.0.3"; sha256="1hvww1x8pyfg7raylh7qgqzhm5jzn3lzjm89af2kzdiaynyw2703"; depends=[Rcpp RcppArmadillo]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
@@ -13246,25 +13259,25 @@ in with self; {
   seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="4.0.2"; sha256="07b8prqx9yy9k2pzm69mf6lahcwzb6z8x52bgph6ljxwji53vyk6"; depends=[abind MASS mgcv nlme raster Rcpp RcppParallel sp stringr]; };
+  secr = derive2 { name="secr"; version="4.1.0"; sha256="1ylwiw33siaqs8yd3pbpxx6lpipsf1rj474bs8yqiv5ihpxqfyga"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; };
   secrdesign = derive2 { name="secrdesign"; version="2.5.7"; sha256="064c9vwcn0pn0hd461j60fzzc21k22gqlm5zcsz2qqvv5c64ynic"; depends=[abind openCR secr]; };
   secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; };
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
   secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; };
   secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
   securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; };
-  see = derive2 { name="see"; version="0.3.0"; sha256="0qcnfv2v7p2day4p6839jlwf6jr9ls8049zw9qfl0xynxnxz66s1"; depends=[bayestestR dplyr effectsize ggplot2 ggridges gridExtra insight magrittr parameters rlang scales]; };
+  see = derive2 { name="see"; version="0.4.0"; sha256="1qnmd43ljrdfwf8ks7a89j7wrhpmibs7r0yyidgchmja4scqyp61"; depends=[bayestestR dplyr effectsize ggplot2 ggridges gridExtra insight magrittr parameters rlang scales]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
   seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; };
   seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; };
-  seewave = derive2 { name="seewave"; version="2.1.4"; sha256="0xi3jw07fvfabsi1k0nf7cbp598b865z430bzkjdrldvc0ckb9cf"; depends=[tuneR]; };
-  seg = derive2 { name="seg"; version="0.5-6"; sha256="187ib8vgkj8zqzwlmwq6q8yldxsv63lahb9mlhrp9fa702650jv7"; depends=[sp splancs]; };
+  seewave = derive2 { name="seewave"; version="2.1.5"; sha256="1qg8f5gik9pw6f9mcxqmrc9x3003s8vdm6g01pjjpyc9qaqiz2vi"; depends=[tuneR]; };
+  seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; };
   segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; };
   segRDA = derive2 { name="segRDA"; version="1.0.2"; sha256="0az27z4pppyz5slckwmgk6qqix710m1s96drlq4fh8bqn2qmz812"; depends=[vegan]; };
   segclust2d = derive2 { name="segclust2d"; version="0.2.0"; sha256="1n5h92dza7wgfpfyzlfb7hbrqb0a8dhc38vml9645gym3a1riwn5"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; };
-  segmented = derive2 { name="segmented"; version="1.0-0"; sha256="1igsfkffpa60zn6j45lhw1zgr5pz6rjknv2f3sylnx5l9fdwibgf"; depends=[]; };
+  segmented = derive2 { name="segmented"; version="1.1-0"; sha256="06cxdrqgnpk5fvbam5i7qa4n71wry0yvlj0jpwbxf267mvpx10fh"; depends=[]; };
   segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; };
   segregation = derive2 { name="segregation"; version="0.3.0"; sha256="0bx3w2dhbikx7vk5gs0b2jc4q4zvwlrj4crv6agmc2pn3ap7i88k"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
@@ -13281,7 +13294,7 @@ in with self; {
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
   selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
   sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; };
-  semEff = derive2 { name="semEff"; version="0.1.0"; sha256="0mch1xzm4j2i612qs6002756zzdl7wmrgjmlp047dpa89dlp2yly"; depends=[boot lme4]; };
+  semEff = derive2 { name="semEff"; version="0.2.1"; sha256="0437pgr6hidscgvfhb9xaryanb1mrbcgb5x1afprc4amw0pjzjrs"; depends=[boot lme4]; };
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
   semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; };
   semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; };
@@ -13292,19 +13305,19 @@ in with self; {
   semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; };
   semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; };
   semiArtificial = derive2 { name="semiArtificial"; version="2.3.1"; sha256="1rjf8wsbwi6kfwsh89kblhl0f3m7rrma7gly7b4xm7bj7jdkljkr"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; };
-  seminr = derive2 { name="seminr"; version="1.0.0"; sha256="1nq057mgafq7wffsb9bcyvgkmwnbd1cndyaky5k6n304g4bsacsx"; depends=[]; };
+  seminr = derive2 { name="seminr"; version="1.0.1"; sha256="1v1mvjfhj5li0xv2iipbqcnl2vhaa1j6hv2x4jcbaiym44jzblhf"; depends=[]; };
   semnar = derive2 { name="semnar"; version="0.7.1"; sha256="0g6l4377i9wdwbcrdhdmsph68bd6qwc5mjlw824mpxn0ggg6vx72"; depends=[jsonlite leaflet lubridate magrittr urlshorteneR]; };
   semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; };
-  semtree = derive2 { name="semtree"; version="0.9.13"; sha256="0am7fm7f9kgq6kmd17axrswlg191ny3pq6b5sf731diz1ghyncmp"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets stringr]; };
+  semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
   sen2r = derive2 { name="sen2r"; version="1.2.1"; sha256="19rzh7xxq6b9rbiqmmk4rwh5x0w3h8p8yk7c3111fggm67jy62dv"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras magrittr mapedit raster reticulate sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars units XML]; };
   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]; };
   sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; };
-  sensiPhy = derive2 { name="sensiPhy"; version="0.8.3"; sha256="03qrxal0wvgiyr5vnnzc8n95h4460p11idnmr6vnr73c5f8q905h"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
+  sensiPhy = derive2 { name="sensiPhy"; version="0.8.4"; sha256="1h225gdnvf3bdw7491h3dcpmdwm8bkqgkqmw9584rmjj8dj24xz1"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
   sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; };
-  sensitivity = derive2 { name="sensitivity"; version="1.16.2"; sha256="1y9w7vxzkw0rx6sbgvs5b0czmksqxcf1c6iycmw6yf4hgwjf5clm"; depends=[boot ggplot2]; };
+  sensitivity = derive2 { name="sensitivity"; version="1.17.0"; sha256="149hl1li8gqhlwc99z7q01vgdncyd54bf490pjmdj6gznkk35i02"; depends=[boot ggplot2]; };
   sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
@@ -13318,9 +13331,9 @@ in with self; {
   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.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.7.6"; sha256="1yjli4lkh164m68qhf5fnz7gvv0wpxb4cwx9vqc3n75m7ybc45vw"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
-  separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
-  seplyr = derive2 { name="seplyr"; version="0.8.4"; sha256="18z3nfxghzzcn23ilgsimbxz8mqi3q45i7b3ihdmkllc3ln1f0vk"; depends=[dplyr rlang tidyr wrapr]; };
+  sentometrics = derive2 { name="sentometrics"; version="0.8.0"; sha256="1aaam2hc25332clicnw00nw5mbflq37myjm0sfr5gn9qjq43qafd"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; };
+  separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; };
+  seplyr = derive2 { name="seplyr"; version="0.8.5"; sha256="0cccnggnix5w2a31prvnsp2hl6x8k4rm4nchik9aiqwj2x5kz3hq"; depends=[dplyr rlang tidyr wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; };
   seqHMM = derive2 { name="seqHMM"; version="1.0.14"; sha256="0ybdp5364jddakkd7rawrfk87hn30fgjpsirlz2440w600m69ydr"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
@@ -13329,6 +13342,7 @@ in with self; {
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
   seqgendiff = derive2 { name="seqgendiff"; version="1.1.1"; sha256="0kj36zbrc96zjha57qx2f2n7wq6fay7c8x49n0jpnmjs66daaxlh"; depends=[assertthat cate clue irlba matchingR pdist sva]; };
   seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; };
+  seqmagick = derive2 { name="seqmagick"; version="0.1.3"; sha256="0983k7fbcv4ai42cxxi4f854b9mqx68rgyvy0mjhpb6md7ba59jy"; depends=[Biostrings magrittr]; };
   seqminer = derive2 { name="seqminer"; version="7.1"; sha256="1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy"; depends=[]; };
   seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
@@ -13340,6 +13354,7 @@ in with self; {
   seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
+  serpstatr = derive2 { name="serpstatr"; version="0.0.1"; sha256="05nl61i1ida6pj6nqx7yvn6wz4ww43ix63pvqa7539r8lr6n3mpf"; depends=[httr]; };
   serrsBayes = derive2 { name="serrsBayes"; version="0.4-0"; sha256="060zs1n5h9ns9dd004f69qmbwbbqla97bhbldm8narhm84f8pf6i"; depends=[Matrix Rcpp RcppEigen truncnorm]; };
   servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; };
   servr = derive2 { name="servr"; version="0.15"; sha256="199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi"; depends=[httpuv jsonlite mime xfun]; };
@@ -13347,6 +13362,7 @@ in with self; {
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; };
   set = derive2 { name="set"; version="1.0"; sha256="0v17pfrrlncb55n1ag8q9qg9q4c9bq535ax0m0m7jdlpaprnwnf5"; depends=[do]; };
+  set6 = derive2 { name="set6"; version="0.1.0"; sha256="1vvafhnl3dvl2iw3lnx0lsjb9vwkad017fri63yslikdhgrfjbqa"; depends=[checkmate R6]; };
   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]; };
@@ -13357,7 +13373,7 @@ in with self; {
   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]; };
-  sfheaders = derive2 { name="sfheaders"; version="0.0.2"; sha256="1bl76g27kv8szivxrp8pki7z16ghk9v50nhwbkl2x66r9d6n778x"; depends=[Rcpp]; };
+  sfheaders = derive2 { name="sfheaders"; version="0.1.0"; sha256="1bbiqym7kvhyq7d39gmqyvivh5pa7q4d75vya2wrg6m930ihmvqw"; depends=[Rcpp]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-4"; sha256="0zaw617zarmwir8l60riky0z6r1j3mwfnm1f32vqcbljb74akdj4"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; };
@@ -13367,12 +13383,12 @@ in with self; {
   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.8"; sha256="15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
-  sglasso = derive2 { name="sglasso"; version="1.2.3"; sha256="1xf4jni7gybk66wp542p92jxrp4lf63ypbwsnb3av5db04bis7ll"; depends=[igraph Matrix]; };
+  sglasso = derive2 { name="sglasso"; version="1.2.4"; sha256="0sdarn39857405ndmqyka5ksvwczb5ifl5aap96wpm625iz2a1pi"; depends=[igraph Matrix]; };
   sglg = derive2 { name="sglg"; version="0.1.5"; sha256="0b2lksn887h92y8l1gjmhm2pxzfn6kk0rjvyh9k2b1j4plkvp73b"; depends=[AdequacyModel Formula ggplot2 gridExtra moments robustloggamma ssym survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
   sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; 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]; };
+  sgof = derive2 { name="sgof"; version="2.3.2"; sha256="020kc6h9iw4qhb9pdi7wk8vcy54dp10x0z3nlq3gwwbj1l9izc44"; 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.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; };
@@ -13386,11 +13402,10 @@ in with self; {
   shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; };
   shar = derive2 { name="shar"; version="1.1"; sha256="157b1pia21qygb7pqb97v8b3bklnfq40xf8y7wg6p2ixkab0ws6c"; depends=[classInt raster Rcpp spatstat]; };
   sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; };
-  sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
+  sharpeRratio = derive2 { name="sharpeRratio"; version="1.2"; sha256="0jn8i8vvqahraw78cw6w05v03x49m62l7m1iz81c6hwg05ld36jy"; depends=[ghyp Rcpp]; };
   sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
-  sharpshootR = derive2 { name="sharpshootR"; version="1.5"; sha256="1r9pmrbdbncph1xjvwa29pzfw0xvw0p0giy098jswiyzfipsjv6k"; depends=[ape aqp circular cluster digest e1071 Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.2.1"; sha256="1qqrjddkj29b7c9vgc2x4w6ya0gilgc983sqbgmm60ljl1ihl958"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales SDMTools seqinr stringi tidyr]; };
+  shazam = derive2 { name="shazam"; version="0.2.2"; sha256="1qa9jfbiv40x2dnvfkgcmp0vikv8k1migffqqn8v96zyisndvj8k"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang 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.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; };
   shiny = derive2 { name="shiny"; version="1.4.0"; sha256="0jvcxs0vdxdlbriahxjzzcmg8v8if21k3xvdgk59iskw71ch81qc"; depends=[crayon digest fastmap htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; };
@@ -13412,6 +13427,7 @@ in with self; {
   shinyMobile = derive2 { name="shinyMobile"; version="0.1.0"; sha256="1jk4dpg78qxpsqnj44ia3z668bhf8mfziiz8v4zp7mmpp7x5447b"; depends=[htmltools jsonlite magrittr shiny]; };
   shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
+  shinySIR = derive2 { name="shinySIR"; version="0.1.0"; sha256="1khl6p7256cy6iqg8wyracdyz08iysak91r79hf0xhh2gbb8fs49"; depends=[deSolve dplyr ggplot2 shiny tidyr]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; };
@@ -13421,7 +13437,7 @@ in with self; {
   shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinybusy = derive2 { name="shinybusy"; version="0.2.0"; sha256="1zhi4nfnwwxn25r47fa8c5dq0wfvxmmdzrr8vfiq3qjj46bi1alf"; depends=[htmltools htmlwidgets jsonlite shiny]; };
-  shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
+  shinycssloaders = derive2 { name="shinycssloaders"; version="0.3"; sha256="1gzq1lhcnhqd145ys3ixf0l13l560fiqr2sc3m2nrijwxlgcw54d"; depends=[digest glue shiny]; };
   shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; };
   shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.7.0"; sha256="0hxg9gxravalfbrh05jixk9pz1qsq92pspysgx0vn2smgvp7rzlb"; depends=[htmltools shiny shinydashboard]; };
@@ -13429,19 +13445,20 @@ in with self; {
   shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; };
   shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; };
   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]; };
+  shinyjs = derive2 { name="shinyjs"; version="1.1"; sha256="14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9"; depends=[digest htmltools jsonlite shiny]; };
+  shinyloadtest = derive2 { name="shinyloadtest"; version="1.0.1"; sha256="0k9b57wm2cv78qf9qryqr1s0p7gsncn8axd285f6rrayg4czb40l"; depends=[curl dplyr getPass ggplot2 glue gtable htmltools httpuv jsonlite lubridate magrittr progress R6 readr rlang rmarkdown scales stringr svglite tibble websocket xml2]; };
   shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; };
-  shinymanager = derive2 { name="shinymanager"; version="1.0"; sha256="0hg92ij4ixn4xp0fqhpvyfxvnpyzyr88ymzxxk7n55hr50l8vbqi"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; };
-  shinymaterial = derive2 { name="shinymaterial"; version="0.5.5"; sha256="0wbi2ccnxjyq4y5xijvn0a38sv56s9cab0c8k86cv5gapyzdzs7x"; depends=[jsonlite shiny]; };
+  shinymanager = derive2 { name="shinymanager"; version="1.0.100"; sha256="1ls5qg4zmqvapxcbkp4jk8r8rqmd223mb9s2hqq022hbyglclhxk"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="1.0.0"; sha256="1mgvxhk2ky3612ci9f1zz8x7z37r176kw1j0b4bs2843gmnxjfga"; depends=[jsonlite shiny]; };
   shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; };
   shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
   shinytest = derive2 { name="shinytest"; version="1.3.1"; sha256="1qn46kgqxfbfimghy5d200rmxpmbp7ckl7dm82m4bnrsf9ivzlgg"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
-  shipunov = derive2 { name="shipunov"; version="1.3"; sha256="0bja3gb837ccyqxncm666749abnlr8bn88k788x0z4mnc8x32zak"; depends=[]; };
+  shipunov = derive2 { name="shipunov"; version="1.4"; sha256="0a2rd8qr9493gq74rqjaxjn9cxygikhy87jf1yqaxa6b9djwdqzc"; depends=[]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; };
-  shortcuts = derive2 { name="shortcuts"; version="1.3.0"; sha256="0y35civsrm8lc508khiwg5igzl1xb141p8012d9civ3pvv7i5vd7"; depends=[rstudioapi]; };
+  shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; };
   shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
   showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; };
   showtext = derive2 { name="showtext"; version="0.7"; sha256="1ihgqzfia36b0n9aa41p1w98wxxvs1lxh1zz0570hbfqmph1sk73"; depends=[showtextdb sysfonts]; };
@@ -13458,9 +13475,10 @@ in with self; {
   sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
   siebanxicor = derive2 { name="siebanxicor"; version="1.0.0"; sha256="0bnpqqhqvqq9kxvzljzp4d5aw9drh78cwyxyqzdvshijl7mmqjwc"; depends=[httr jsonlite]; };
-  sievePH = derive2 { name="sievePH"; version="1.0.0"; sha256="1v21a08c031b7pd7zdz4dkgb2mi67brwiva3ysxyy06wr2yb48g4"; depends=[survival]; };
+  sievePH = derive2 { name="sievePH"; version="1.0.1"; sha256="1hdccfq39sw3jsakv8lrnjp8mmc431l6ka1g9r53ihrz18s6c39v"; depends=[survival]; };
   sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
+  sigInt = derive2 { name="sigInt"; version="0.2.0"; sha256="1y3qbfsynssam05q4947zqd0dkrpcnq5pla409i3xy511wv9702d"; depends=[Formula MASS maxLik pbivnorm randomForest stringr xtable]; };
   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]; };
@@ -13470,10 +13488,10 @@ in with self; {
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
   signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
-  signs = derive2 { name="signs"; version="0.1.1"; sha256="1pcn5pf3gc8fl5nrfjqafx1ap9s23q7kqnxwkknqbabqhl7d1453"; depends=[rlang scales]; };
+  signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; };
   sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; };
   sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; };
-  siland = derive2 { name="siland"; version="1.2"; sha256="1njn5a4gr4rpf8xwbfvxiyg7h64pfzxijakn9sbhb1agspn5z1zz"; depends=[ggforce ggplot2 lme4 raster rgdal sp]; };
+  siland = derive2 { name="siland"; version="1.4.6"; sha256="0alnyd3phjv9kg21px96daw21613wjgp1ypqh8b4h0djcjd9xn17"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; };
   silicate = derive2 { name="silicate"; version="0.2.0"; sha256="19386cd46jil4fhs6340wbk96igi9jlfgghbm88c0j5ff4ah1bsj"; depends=[decido dplyr geometry gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; };
   sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
@@ -13483,7 +13501,7 @@ in with self; {
   simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; 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.3"; sha256="09ss23sh90b8ggmw26pldx3jnbvh9l0rr27268xf4sri013y7hiq"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
+  simPATHy = derive2 { name="simPATHy"; version="0.4"; sha256="1blvgaadp7iz0mcgax2xc8wa7aa9f82q09qym1wl8xdv01m29b80"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
   simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
   simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
@@ -13499,8 +13517,9 @@ in with self; {
   simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; };
   simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; };
+  simfinR = derive2 { name="simfinR"; version="0.1.0"; sha256="0g86mci5fjdxj46i1lff51fdzbwzwr3f4vsq74s4mlwl6g093bqy"; depends=[dplyr jsonlite lubridate magrittr memoise purrr]; };
   simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; };
-  simmer = derive2 { name="simmer"; version="4.3.0"; sha256="1j7mpgi0sicc673rma3h40n651bdy03dmyjvs7ry8y7d10lj01ls"; depends=[BH codetools magrittr Rcpp]; };
+  simmer = derive2 { name="simmer"; version="4.4.0"; sha256="0kq13ly33hgnwcd53mm372cqcd8glpgdb1jn4q22gd6pbk6j7cjg"; depends=[BH codetools magrittr Rcpp]; };
   simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; };
   simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; };
@@ -13509,6 +13528,7 @@ in with self; {
   simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; };
   simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
+  simplePHENOTYPES = derive2 { name="simplePHENOTYPES"; version="1.0.5"; sha256="02cr7yk379yilf53rv9s36g2gg1z5cq2qigy7lq31wcpb7vhjig3"; depends=[data_table gdsfmt lqmm mvtnorm SNPRelate]; };
   simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; };
   simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; };
   simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; };
@@ -13532,27 +13552,26 @@ in with self; {
   sindyr = derive2 { name="sindyr"; version="0.2.2"; sha256="1clcn864p0kx1rlb9rr9gl2cjsyr5rrbvqd00rsf90vgq2p2aj8x"; 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=[]; };
-  sinx = derive2 { name="sinx"; version="0.0.12"; sha256="0hv54n6pc8qdxl1kmwbrnnmgmd8mz6fzlplz9nr7iws1y1v0ckf5"; depends=[bookdownplus clipr cowsay crayon jsonlite multicolor pagedown rmsfact rosr xaringan]; };
   siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
   sirt = derive2 { name="sirt"; version="3.7-40"; sha256="18adv3gnk1cg9i3jrv6mxfdn68gpdak8451jpwkagz7n9hr0x6dj"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; };
-  sirus = derive2 { name="sirus"; version="0.1.2"; sha256="1ryi9b6vadgmv3ybb2vw7sqy4nr8f8zxb3by0s6f8xqn6vfpmmbg"; depends=[ggplot2 Matrix Rcpp ROCR]; };
+  sirus = derive2 { name="sirus"; version="0.2.1"; sha256="04ln1i017qb94gz22in9w36b808a0gxbdildwyfzchf2c92wp5cp"; depends=[ggplot2 glmnet Matrix Rcpp ROCR]; };
   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]; };
-  sismonr = derive2 { name="sismonr"; version="1.1.4"; sha256="0dimah8lzscg9bx5vd3ll32zyp74va7a4nk9j9k5nzzyg06rs3l4"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; };
+  sismonr = derive2 { name="sismonr"; version="2.0.0"; sha256="1irsnsmph8hpmglx7y7293z38yfa9vzq1823pcp393iiyip1n8d0"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; };
   sitar = derive2 { name="sitar"; version="1.1.1"; sha256="1klnfp54sq0jgsyaha6k4i5fv313icjmri5khfsdg1q1zzqxw1f8"; depends=[dplyr glue nlme purrr quantreg rlang rsample tibble tidyr]; };
   sitmo = derive2 { name="sitmo"; version="2.0.1"; sha256="0apdhwy3kxs39agsbvx5vn3xsgb22bf3jrwmr2cmqk9kmxbx740c"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
   sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; };
   sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; };
-  sivipm = derive2 { name="sivipm"; version="1.1-4.2"; sha256="0y1wpzvndbyyzf063mzisqdk9ndj29ygiipmmz7i4xdpwidv21p6"; depends=[seqinr]; };
   sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.8.0"; sha256="0ahz6v6bhvq1537inwakmrafs44hs2m9w0ra8q17fz626nn9rb9b"; depends=[bayestestR dplyr effectsize forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr parameters performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.8.1"; sha256="0rmfc2pq80w0kxh6icljhqm31q580s0czvllsfxk6crmpyfgxkp7"; depends=[bayestestR dplyr effectsize forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr parameters performance 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.1.1"; sha256="0c9wy0gsr2sbkrv2638xbi7qm0gl6jyr6sfricavhkm7l4hljjkz"; depends=[haven insight magrittr purrr rlang tidyselect]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.8.2"; sha256="0rl0bmk91wc4dxdgy008fl0dwkx3ffvys30vgpnr78lb4pk45nb2"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; };
-  sjstats = derive2 { name="sjstats"; version="0.17.7"; sha256="029rl05p88bp01favz300m980r1khcx2a2kn88yqbnbgkjjgqqc6"; depends=[bayestestR broom dplyr emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.1.2"; sha256="1vnx067mxnvz4jzhmpiarda8ln6habzj02qikvkix5piiy85sqcw"; depends=[haven insight]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.8.3"; sha256="0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; };
+  sjstats = derive2 { name="sjstats"; version="0.17.8"; sha256="0gagqbcmimlvxhpjkmd3s17mbrz5n937qksca1hvm6kj4rk37hzb"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
+  skedastic = derive2 { name="skedastic"; version="0.1.0"; sha256="19jfsir1z7lv7h3085by9b638jzqgc9753aya21x3rvzq7hb3pr3"; depends=[broom car gmp het_test lmtest lubridate magrittr matrixcalc pracma Rdpack Rmpfr tibble tseries]; };
   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=[]; };
@@ -13565,7 +13584,7 @@ in with self; {
   skynet = derive2 { name="skynet"; version="1.3.0"; sha256="02kkgrqcrg1x61fip47w6vzi8nya12rxg47qjhn4lw4czaympqpx"; depends=[data_table dplyr ggplot2 ggrepel httr igraph maps stringr]; };
   skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
-  slam = derive2 { name="slam"; version="0.1-46"; sha256="1ihhbx76miwys35gsbhijriadvrw4f51lc3v45pnn6cvcfd9hr0b"; depends=[]; };
+  slam = derive2 { name="slam"; version="0.1-47"; sha256="12fggw2c7hz3bpvsaqm24g3r6lbpq6jgli24g7x5j859iak5cqv9"; depends=[]; };
   sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; };
@@ -13582,16 +13601,17 @@ in with self; {
   slouch = derive2 { name="slouch"; version="2.1.2"; sha256="0xf2saf4q0ywmng3avl6hjd2wjjzfpbwlnagggvs8ri41jyk7gma"; 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]; };
+  slurmR = derive2 { name="slurmR"; version="0.3-0"; sha256="0301h8fzkghk41afkfprkbf3nia07apgjly0njan07vhk144k0qr"; 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="2.0-0"; sha256="06gx24arv1md32vsj17lbq42vxpvds7qxwap4x12hj5nyxv4n7yy"; depends=[candisc colorspace doParallel ellipse foreach 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.4.0"; sha256="00fgjcx0pqj03f4bhbzdcj8194l0y1rp34qp51p5vnnagdksj11j"; depends=[doParallel foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; };
+  smam = derive2 { name="smam"; version="0.5.3"; sha256="0hns3w6sm06fwxy3aybaz21j8bii5m5ps932ldilh0dj7rsqii6a"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; };
   smapr = derive2 { name="smapr"; version="0.2.1"; sha256="1gcq66gs6968c5h303dqd2jyw2rcdwxv642ki1cmpdj6ix665dpr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smartR = derive2 { name="smartR"; version="0.62.0"; sha256="1jc2zvys05xs8y24fsrqkfvg77dpcqd2ydq1rknh0j9m4qhd9x9i"; depends=[caret chron clues cluster foreign ggplot2 ggrepel ggthemes gridExtra gstat gsubfn gWidgets2 gWidgets2RGtk2 igraph jpeg jsonlite lattice mapdata mapproj maps maptools marmap mtsdi nnls PBSmapping plyr R6 RColorBrewer reshape2 rgdal rgeos rjags ROCR rpart scales shape sp spdep sqldf vegan]; };
-  smartdata = derive2 { name="smartdata"; version="1.0.2"; sha256="1j1ngvlaj0kx0kp8ffvndcd5kk8zamjrgx2dn156zp4zjsd27vhv"; 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]; };
+  smartdata = derive2 { name="smartdata"; version="1.0.3"; sha256="06hqpsr68dqm5544965g648267kkixf44bh0g5x6ik66vj6crkfm"; 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.2"; sha256="1w2vf6q3f7bywkvazgxn9gh7f2bqy4rg74mm4r6izw4gx7r81ls6"; depends=[MASS]; };
   smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; };
   smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; };
@@ -13601,13 +13621,14 @@ in with self; {
   smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; };
   smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
   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="1.1"; sha256="0kbjb1335wcljwj2nyxipxndzrsrrrims90zbplpdlz3h6afshii"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; };
   smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; };
   smicd = derive2 { name="smicd"; version="1.0.3"; sha256="0z7j14ijyccy6m4mnh3xn1m4pppmm8apbgm5x3cdpfiwfksw3j37"; 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]; };
+  smog = derive2 { name="smog"; version="2.0"; sha256="1nrvh51kvh290w9wdyil5isx5xfz2yw8nmhm6f32hajipgn9j5fl"; depends=[doParallel foreach Rcpp RcppArmadillo Rdpack tidyr]; };
+  smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; };
+  smoof = derive2 { name="smoof"; version="1.6.0"; sha256="0xkwj01pgzvxr6cxxmml0f4375s2s8kni69immcpw66avs2ljw5m"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
   smooth = derive2 { name="smooth"; version="2.5.4"; sha256="0apjjqzb36z71500lyccm9jdss7h7736g8lrs3rfz5f6d2k5yqf6"; 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]; };
@@ -13620,18 +13641,17 @@ in with self; {
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
   smoots = derive2 { name="smoots"; version="1.0.1"; sha256="1kk1hvfqxslg76gy8gzaidv3d55pflyvbv3ski6rkk0l9lwbb2q1"; depends=[]; };
   smotefamily = derive2 { name="smotefamily"; version="1.3.1"; sha256="062yps71bqnyff1hzqb7yvigvqg2lnc24r9gfp8m3zhvmyprk3cp"; depends=[dbscan FNN igraph]; };
-  smovie = derive2 { name="smovie"; version="1.1.1"; sha256="10mqzk9xrd3iicldz8n49v0nj81rjwy6fds4kxwa7vzsqapdw1g2"; depends=[revdbayes rpanel SuppDists]; };
+  smovie = derive2 { name="smovie"; version="1.1.2"; sha256="1z5mw8m67dqv2jfywgmnvvdac4qw89zj8nqzz9262jq8i5i9bfja"; depends=[rpanel]; };
   smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
   smurf = derive2 { name="smurf"; version="1.0.2"; sha256="08k64y0wb9da7ji94zra411zwcvssi0lb1drh98p6w9pwvn552rf"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; };
   sn = derive2 { name="sn"; version="1.5-4"; sha256="0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6"; depends=[mnormt numDeriv]; };
-  sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
+  sna = derive2 { name="sna"; version="2.5"; sha256="1j3i6300m686qqfmyvadim377cd3mplzgj6mandygw8brg50id8k"; depends=[network statnet_common]; };
   snahelper = derive2 { name="snahelper"; version="1.0.0"; sha256="15x7qp36lzs61ll3gqyjmxix0pqnyf2rz799mxzkzxzwqsp0srwi"; depends=[colourpicker formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; };
   snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; 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=[]; };
-  snem = derive2 { name="snem"; version="0.1.0"; sha256="1267i8fvj1830dkh7k4j07llgv7rq983mfw9r5j9s22vgyf2sk76"; depends=[mvtnorm]; };
   snfa = derive2 { name="snfa"; version="0.0.1"; sha256="01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb"; depends=[abind ggplot2 prodlim quadprog Rdpack rootSolve]; };
   snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0.1"; sha256="1ls3c9f47lgrnja8p34iz2md2mf5jva9rn5n1h3a43zs29g019v8"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; };
@@ -13650,12 +13670,12 @@ in with self; {
   snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
   snplist = derive2 { name="snplist"; version="0.18.1"; sha256="14x31h8h3lx25rm30vhp89byrzy3qrmawi07pmzy4xpxdf0rxm4s"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
   sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; };
-  sobir = derive2 { name="sobir"; version="0.1.1"; sha256="1v9ic35s1qm27hj2fihli68x2b5lxhddca6hgvdnpwq4hpz4vlmj"; depends=[ggplot2 raster rlang scales sp statmod tidyr]; };
+  sobir = derive2 { name="sobir"; version="0.1.2"; sha256="0di9mk1c1jf8yr7jpmfm19w2w3p9lz1mkgrv3bmfyab83aghvbfp"; depends=[DescTools devtools dplyr ggplot2 raster rlang scales sp statmod stringr tidyr usethis]; };
   sobolnp = derive2 { name="sobolnp"; version="0.1.0"; sha256="00rmigjyd3fsmhrhbvjzrfsl4ir0xpfr4xbgjws6vkx2rmcqnq1s"; depends=[minqa np pbmcapply]; };
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
-  socialmixr = derive2 { name="socialmixr"; version="0.1.5"; sha256="1kkvhrw28cgijnhcyc8phbq797pcal5h40av8brpbvvcf82yx0xd"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.6"; sha256="0hrkylasyaalsh4gsazgfz5vyqvwnq5n4lzqmzjs2njlrkgwwf5y"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; };
   sociome = derive2 { name="sociome"; version="1.3.0"; sha256="0anynmpb6i8hwp5b0axkmfwsdyfzwd28g26ril2i3mlcivkgjyg4"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; };
   socviz = derive2 { name="socviz"; version="1.0.0"; sha256="14713g5saa167c5wk06i9v5708cj60znc8a7c3a2wpk0h2idfjlb"; depends=[dplyr fs magrittr rlang tibble]; };
   sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; };
@@ -13664,21 +13684,20 @@ in with self; {
   softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
   softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; };
   softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; };
-  soilDB = derive2 { name="soilDB"; version="2.4.1"; sha256="0ac4pqfnpzjv6bgsyd759zkqs427jbsj5jl7zq3sdqhsq2xawjap"; depends=[aqp curl lattice plyr raster reshape2 sp xml2]; };
-  soilassessment = derive2 { name="soilassessment"; version="0.1.0"; sha256="0xap6x41my7ardjpcp6rp3wvvkbjcvf6p2wla4zg2l72zb55s710"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools randomForest raster rgdal rpart soiltexture sp]; };
+  soilassessment = derive2 { name="soilassessment"; version="0.1.1"; sha256="0vxw0wzc2fw1asasnkfc7mzz616l243dh27vn2fqm8sw7d3509ji"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools nnet randomForest raster rgdal rpart soiltexture sp]; };
   soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; };
   soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; };
   soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; };
   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]; };
+  solaR = derive2 { name="solaR"; version="0.45"; sha256="1vxpwaizjxy27r54anhf48pf97lm4ck750m0p4kmh716irmhp319"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; };
-  solitude = derive2 { name="solitude"; version="0.2.0"; sha256="1wvhvzak1jy31z3q0s2m25kbkkn725qdvawpdr4gkcswk3vvr22x"; depends=[data_table future_apply igraph R6 ranger]; };
+  solitude = derive2 { name="solitude"; version="0.2.1"; sha256="0n4f59bjdcqfclagpjric965zsl1jfl8p194p64viainb9w11xz4"; depends=[data_table future_apply igraph R6 ranger]; };
   solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; };
   solrium = derive2 { name="solrium"; version="1.1.4"; sha256="0x83s83r4sr4r9cgk9fgcw6xz778m4gg14fzwib3qja6ax2xpk2z"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="2.7.0"; sha256="0xgwpng5264q47axryxr19x70fljyj9frc100ys7q30b325w963h"; depends=[dplyr httr jsonlite mime]; };
+  solvebio = derive2 { name="solvebio"; version="2.7.2"; sha256="1f9sqgw5p4vzybg7iv12yy9nckp5rsb819pawgp4d2d7vwjhx4ky"; 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]; };
@@ -13692,18 +13711,16 @@ in with self; {
   sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; };
   sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; };
   sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; };
-  soobench = derive2 { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
   soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; };
   soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; };
   sortable = derive2 { name="sortable"; version="0.4.2"; sha256="08v78r0vibr0lk09lxm0s0vfkzpp03asqnqpl8jqa6rxcb484fri"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
   sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; };
-  sos4R = derive2 { name="sos4R"; version="0.3.1"; sha256="0zcrk8fgg2jsp29wvbw448yp15m4lz0sbf570nyjg3admnpf5whs"; depends=[httr sp stringr xml2]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   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.5.1"; sha256="0mzxqwi0qqvlaf48m901szbfqn8riwkghxjqbcpcwrx77rph22gp"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; };
+  soundgen = derive2 { name="soundgen"; version="1.6.0"; sha256="0kdlv0kxhr5r1cdls1g7pf2lyphwmvhv049s8aa31i2dlrm21j1y"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs 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=[]; };
@@ -13729,26 +13746,27 @@ in with self; {
   space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; };
   spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-  spacesRGB = derive2 { name="spacesRGB"; version="1.2-2"; sha256="0rl5xh4pa29ab3ckqhb4pq7s8x76738na320kzhidyhj6x39a6kf"; depends=[]; };
+  spacesRGB = derive2 { name="spacesRGB"; version="1.3-0"; sha256="1flnvrmq0hdrhxmn5djbhc6fanqhmr1i3q5ik7qcxsb0jvnyincd"; depends=[]; };
   spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-4"; sha256="04387yrz9kmr4y10d6dg2z0nn56qafgi1v08jfw5wcwq12cm7052"; depends=[]; };
-  spacetime = derive2 { name="spacetime"; version="1.2-2"; sha256="0bgaarh2ibj3z6z504mzcb94x6w2bh5vyn1ar1lllqf4wn93z78y"; depends=[intervals lattice sp xts zoo]; };
+  spacetime = derive2 { name="spacetime"; version="1.2-3"; sha256="0nxjp78vdnr8m2nn9czf1rp7b61md4fjfnyqdlgp982x5nb0nz6a"; 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="1.2"; sha256="1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks"; depends=[data_table reticulate]; };
   spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; };
   spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; };
-  spam = derive2 { name="spam"; version="2.4-0"; sha256="0xb7a0x1i93kzijr518m9plzmg8s3mxh5anwfx9xrkg5ipldvz10"; depends=[dotCall64]; };
-  spam64 = derive2 { name="spam64"; version="2.4-0"; sha256="1s2kjjyzrvj9yc57x5f03pkc4p2xclfnny14xch6dcv6rkkk6izq"; depends=[]; };
+  spam = derive2 { name="spam"; version="2.5-1"; sha256="0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="0.18.0"; sha256="047xk0a2a93pzda8ygsxbvhdd2ycs95rqrkljwgrd698l9fkqsc4"; depends=[abind complexplus fields foreach magrittr MASS matrixcalc miniUI minpack_lm mmand nnls oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr svd tibble viridisLite]; };
+  spant = derive2 { name="spant"; version="0.19.0"; sha256="1am4xvvrg71w2151gsidcbhfbchgb6q76zghn7qgv3xlihfvxgzc"; depends=[abind complexplus fields foreach magrittr MASS matrixcalc miniUI minpack_lm mmand nnls oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr svd tibble viridisLite]; };
   sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; };
   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.2.0"; sha256="005pdfb08clq2fsabdxcbmd4n8nj5ix6yqk5pxpv3gvrzw8s7y32"; depends=[DBI dplyr sparklyr]; };
-  sparkbq = derive2 { name="sparkbq"; version="0.1.0"; sha256="0jcxnivi5zfbixmdywhn1v42lxi085wh7r4c26laclz9j2wvj8mk"; depends=[sparklyr]; };
+  sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; };
+  sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; };
+  sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="1.0.5"; sha256="1sh023f6djxm2bmjhrbgly8x3y87vlcjx00p7s3vkc2zl3mpydy5"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; };
+  sparklyr = derive2 { name="sparklyr"; version="1.1.0"; sha256="19dgfj76nammj1di9bsn7s6k82ksj46jpqd6c309axxlly6grhj0"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; };
   sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; };
@@ -13776,17 +13794,14 @@ in with self; {
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
   sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; };
   sparsevar = derive2 { name="sparsevar"; version="0.0.11"; sha256="18cylbi788ibpry6h9yphrwx2wwsaa25bq2s13h0dcfxyicl2f9p"; depends=[corpcor doParallel 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.2"; sha256="040iq7y5fk93zcvbinnmlhj9l8w3bjq3yqcf7v715i77hx5d18bs"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
-  spate = derive2 { name="spate"; version="1.6"; sha256="0jy9rj5xd1f8y97kyx1sx0kml2g7q88m4fz7v8kh0hinc6dzh2sk"; depends=[mvtnorm truncnorm]; };
+  sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; };
+  spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; 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=[]; };
-  spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
   spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; };
   spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; };
   spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
-  spatialEco = derive2 { name="spatialEco"; version="1.2-1"; sha256="12viar7ym2k5w7a6hjwf0vanpm38l6v3fpk8qd3amc162aw8p7nj"; depends=[cluster dplyr EnvStats fasterize maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
-  spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
+  spatialEco = derive2 { name="spatialEco"; version="1.3-0"; sha256="1l6ig6cw5hlm5g9ihah7ky5z82dcccnzr0ih4h5x7givrdrrd86g"; depends=[cluster dplyr EnvStats fasterize maptools MASS RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep velox yaImpute]; };
   spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; };
   spatialfusion = derive2 { name="spatialfusion"; version="0.6"; sha256="13bpiw1f847nlrsvg6bpgb62pfgm5j47v7cy7x4bqxh497ci263b"; depends=[fields geoR Rcpp rstan SDraw sp]; };
   spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; };
@@ -13798,7 +13813,7 @@ in with self; {
   spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
   spatialwidget = derive2 { name="spatialwidget"; version="0.2"; sha256="105pgsv4dq3pmk9bylb3fxzvp44frfp6xcvq5d01ja4gnwmb35p2"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp]; };
   spatsoc = derive2 { name="spatsoc"; version="0.1.9"; sha256="1s7vhn3ywsdp91z4psx7nairxcfhblzyvx44v4an4rwhvvhvys3c"; depends=[adehabitatHR data_table igraph rgeos sp]; };
-  spatstat = derive2 { name="spatstat"; version="1.61-0"; sha256="01jr9krizch11mhhkn4134x9p517q83chxyjvm36rn0qs1d6l785"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.62-2"; sha256="0frmm14rlhfmhby5zxjg6ngck66v85j0x8yz7r7gnx1x3g2ivk2p"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
   spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.11-2"; sha256="0jkpj4m44cqid5jdn7fwg3cl15lsmc0dp3bzp6759spivsx1yzq1"; depends=[Matrix spatstat spatstat_utils]; };
   spatstat_data = derive2 { name="spatstat.data"; version="1.4-0"; sha256="137cf9x6qcp7lw3rpjqizsy73z99yihff8gr434wlz7b5fwmn7hj"; depends=[spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; };
@@ -13806,9 +13821,9 @@ in with self; {
   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.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.6.3"; sha256="0ik5qmf0f0l77rbg78rp8v606h0d1qp4kccl6j3vqfb2hjsqb7r0"; depends=[]; };
-  spc4sts = derive2 { name="spc4sts"; version="0.5.1"; sha256="0fvmzp222qsprl7jhmj9yz23kf1n7xl4i05infms3nasgac20hcb"; depends=[gridExtra LS2Wstat rpart]; };
+  spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
-  spcosa = derive2 { name="spcosa"; version="0.3-8"; sha256="1hw3njn2c8wj8bk2qpnbi2mbhj485q3gpbjf1gq9k6my4brdp86b"; depends=[ggplot2 rJava sp]; };
+  spcosa = derive2 { name="spcosa"; version="0.3-9"; sha256="1arwrkv2sj30mbz2a2mifag2yay5bswi4f1rrjhf16ap78xdg7pj"; depends=[ggplot2 rJava sp]; };
   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]; };
@@ -13818,7 +13833,7 @@ in with self; {
   spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.5"; sha256="1qxpvjqvfcjsy3z0naz438aa95v2d3imdfxj20vfb2zwpv9l3215"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="2.6.0"; sha256="1q08iqqh885rnkw57ia55ax6g59jkz0i4kagz69frs089sm5carf"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 Rfast rvest xml2]; };
+  speaq = derive2 { name="speaq"; version="2.6.1"; sha256="15v7lr2mczqc5ma2n9gyszfkyljnsds6c8lc5vy0qkvwfl01sv3v"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 Rfast rvest xml2]; };
   spearmanCI = derive2 { name="spearmanCI"; version="1.0"; sha256="1xi51dphv91j5hgrd25sqs1li0g24cwpa1k162arw5b0qfl04f17"; depends=[emplik MASS]; };
   spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
@@ -13830,6 +13845,7 @@ in with self; {
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
   spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.0"; sha256="02j374zsz4ba8ldy52x43rih1p77b56cv5xlbycj5wmkzny2gzx1"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; };
   spectrolab = derive2 { name="spectrolab"; version="0.0.8"; sha256="1hjvi9na94f7n7yr64p0bvh0mzckwmfh36d6zxisrxr08zxwyxzz"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; };
+  speech = derive2 { name="speech"; version="0.1.0"; sha256="007s32w8qr45x1n40xdh85a329cgmm3809bi62ghnxzfny9vjb07"; depends=[dplyr lubridate magrittr pdftools purrr stringr tabulizer tibble tidyr tm]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
   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]; };
@@ -13839,10 +13855,10 @@ in with self; {
   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]; };
   spex = derive2 { name="spex"; version="0.6.0"; sha256="1m56vmp1zacipr8kw4pwh0rpc0jhi8a59351g9c6gpx48ysj9sbk"; depends=[quadmesh raster reproj sp]; };
-  spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
+  spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
   spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; };
   spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; };
-  spgs = derive2 { name="spgs"; version="1.0-2"; sha256="0cfi5d0cpfj5sfni18xhira807z7sf88c6rpiyml6abrq7vbi5zv"; depends=[]; };
+  spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; };
   spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
   sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; };
@@ -13876,14 +13892,14 @@ in with self; {
   splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-75"; sha256="14bg0yzwk3v0b1qrlfaxv48dpk380ha6wb2w4k02c9vmb51ysmw0"; depends=[splusTimeDate]; };
   spm = derive2 { name="spm"; version="1.2.0"; sha256="0kn3ahhvpcr0qpsqid4d7rx613a9dpdw2x4zgrnmsimmw026q7xn"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; };
   spm12r = derive2 { name="spm12r"; version="2.8.1"; sha256="1ndak1ba6gh3hij0x4njr4hv6nfvq91dpgb0zdw0nl11bi6999b0"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
-  spmoran = derive2 { name="spmoran"; version="0.1.7.1"; sha256="0nxg1xl3m4lkpxrkfcbnmf1x0gf43llz7095rj6i3flgmymirnxh"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; };
+  spmoran = derive2 { name="spmoran"; version="0.1.7.2"; sha256="0gqpnam9z6rni7sswdy3il3z5sdal8dlwm1lpzascdg709qgvdd8"; 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.2"; sha256="1pfgffcaycv8ym9sal24s7h3zycjnnkkwhp4c2drigh6qvq8bly6"; depends=[MASS Rcpp RcppArmadillo]; };
+  spnn = derive2 { name="spnn"; version="1.2.1"; sha256="1yj89j7nynfyw1ikm6q5kdwdgiiwxx0aa6kgnri5wfnb4l0356l7"; depends=[MASS Rcpp RcppArmadillo]; };
   spocc = derive2 { name="spocc"; version="1.0.2"; sha256="1mglkbbr2zhy884ilhxy2dkcjlr4aq16z08vs9gc44258i59kzy0"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
   spongebob = derive2 { name="spongebob"; version="0.4.0"; sha256="1ar5173fwx1am5rgjlnczfla6b49g0azl0h9vn89ipw7f71rr5j7"; depends=[]; };
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
-  sport = derive2 { name="sport"; version="0.1.2"; sha256="1d5j42a6gx64pxh8bifrzc08z382sz55339f9237s6zq751pjjjy"; depends=[data_table ggplot2 Rcpp]; };
+  sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; 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="2.1.1"; sha256="0d3n75gyyqi5vgp3z4v3g9l7963xgadi98p1b5iag78zzz1zkcz8"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; };
   spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; };
@@ -13899,13 +13915,12 @@ in with self; {
   spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; };
   spsh = derive2 { name="spsh"; version="1.0.4"; sha256="11xfbhj9g8c99npzs76y30j829gfvhi9zrq2dn97c1idd08200c9"; depends=[DEoptim FME lhs pracma]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
-  spsur = derive2 { name="spsur"; version="1.0.0.3"; sha256="101k39g0psvvrf8qkic9ijh2sps444i5bl1z3fr9c4i29yfgzvnm"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; };
-  spsurvey = derive2 { name="spsurvey"; version="4.1.0"; sha256="1f48jddws3whaakvkcps7kvg179q74mjprh0rs3y6wfhfn0w67hm"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; };
+  spsur = derive2 { name="spsur"; version="1.0.0.4"; sha256="0av0bay2dyfavsckqzjqr490k05fwfncr0yk1wxv741w35ww9mpx"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; };
+  spsurvey = derive2 { name="spsurvey"; version="4.1.1"; sha256="0ckr2lciqax391g6q6zqsq1bmjbcpp1k8ndzr754vslqn5cibffj"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; };
   spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
   sptemExp = derive2 { name="sptemExp"; version="0.1.4"; sha256="16rp20l65id6jiqify7hii0xpgkiyhgp9xg89b002n0jsy10pgph"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
   sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; 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]; };
   sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
   sqlparseR = derive2 { name="sqlparseR"; version="0.1.0"; sha256="0zcna9y61v1qklpnhrwgv1djg4hyx3k5an32caapszi8qm9nq3x8"; depends=[reticulate]; };
@@ -13914,18 +13929,18 @@ in with self; {
   squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; };
   squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
-  srm = derive2 { name="srm"; version="0.2-10"; sha256="1vcggiifp3h12pb4dcdyz4345n2sr5yjszdjgn6s4jsc99lzmj0a"; depends=[Rcpp RcppArmadillo]; };
+  srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; };
   srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; };
-  srvyr = derive2 { name="srvyr"; version="0.3.6"; sha256="0d8mqi0cf8kxkw802vhrvnazg3kdnqzg8x5myfmz3a3m8cbk8w8q"; depends=[dplyr magrittr rlang survey tibble tidyselect]; };
+  srvyr = derive2 { name="srvyr"; version="0.3.7"; sha256="0mj2s98qlvy9jqsnfhv4l9d35wvk89wi5iygc7s7i8m50ph22glv"; depends=[dplyr magrittr rlang survey tibble tidyselect]; };
   ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; };
   ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
   ssa = derive2 { name="ssa"; version="1.3.0"; sha256="0lbwvw8f88wvlhzd469fww0av0nbi6l76vmmxbps0ifw2q87l00d"; depends=[iterators]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
-  ssc = derive2 { name="ssc"; version="2.0.0"; sha256="0w7c0blqny7dyjh1a6l9lr7nysgpmasfqbf7wf368rwmv59pk0b3"; depends=[proxy]; };
+  ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; 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.3"; sha256="1q6mg28bp48bgzr2ahbw16d9zbadhpq3mnd91c15cm4dq1airksv"; depends=[checkr FAdist fitdistrplus ggplot2 scales VGAM]; };
-  sse = derive2 { name="sse"; version="0.7-13"; sha256="0h2fgp66jyqyfizlz644wdyhdabcflgawx9nqsfibyyqigkicm97"; depends=[lattice]; };
+  ssdtools = derive2 { name="ssdtools"; version="0.1.0"; sha256="1bnr9yk7c9a318pisnq7bnwb4k1ipnyksa08yaqpz8zqc88nbg4p"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; };
+  sse = derive2 { name="sse"; version="0.7-15"; sha256="1g1hxw1k8wnlzy7qif6334ncp4dxznkf2anhvzcha9iwy56byn1n"; depends=[lattice]; };
   ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; };
   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]; };
@@ -13959,47 +13974,51 @@ in with self; {
   stabm = derive2 { name="stabm"; version="1.1.0"; sha256="17vd3dgfxd1y5f797l8in2sj4hd9fg3s1xdvqjw2x4pgjz0i9w61"; depends=[BBmisc checkmate Matrix]; };
   stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; };
   stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; };
-  stackoverflow = derive2 { name="stackoverflow"; version="0.3.0"; sha256="184iz5ng7d31cgnn0b51hh11h1mn6pjdkfcm7ssvgbhs83j2x4r6"; depends=[]; };
+  stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; };
   stacomiR = derive2 { name="stacomiR"; version="0.5.4.2"; sha256="0dhf91wmv3mz120g9bwspgq9qs6d8sk1a2vxd7xl0jibgx6fk22x"; 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]; };
-  stagedtrees = derive2 { name="stagedtrees"; version="1.0.0"; sha256="0jlblkinbf979dpdlsn9zls6wx3l2mmnvlrq4zm38nc5i241ipyz"; depends=[]; };
+  stagedtrees = derive2 { name="stagedtrees"; version="1.0.1"; sha256="0ycv4gban5nb1c26riwamvbz5jk740ixhm4f6cmqa0qyyd6nvm9k"; depends=[]; };
   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]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
-  stapler = derive2 { name="stapler"; version="0.6.6"; sha256="12habm5whsfwww3linybajk1d580a23ry3rnhgvykjsi1fkyq8aw"; depends=[matrixStats RNifti]; };
+  stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; };
   staplr = derive2 { name="staplr"; version="2.9.0"; sha256="1m1rikd1ijw9svdfm7nn9fnc9pycymbnnv2dq7ygs40jkq2mr4zp"; depends=[assertthat glue stringr]; };
   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.4-0"; sha256="1wby9mkqybq17aakplhz22xp3xkpih9y5b2kc5mhgsl7s07glh42"; depends=[abind classInt lwgeom rlang sf units]; };
   startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; };
-  startup = derive2 { name="startup"; version="0.13.0"; sha256="0xwilml9yv26l5bygnn9158nc0z0b8aydf09klxzsyycmsp0r2y8"; depends=[]; };
+  startup = derive2 { name="startup"; version="0.14.0"; sha256="1s1h0mvb7wxp6scl2l8lrdlgfw85g67xsrihgad4c89ndis9px6l"; depends=[]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.3.0"; sha256="1xc10pkv3dq7x98xjqkg7ily89qj2r637y5qlnfvk08n6mzhn8w0"; depends=[igraph MASS]; };
-  statVisual = derive2 { name="statVisual"; version="1.1.8"; sha256="06l6f9zbycwrm47hi564v1lnxx8xjmrn79kva84n0gliblci8nx8"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma magrittr multigroup pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; };
+  statVisual = derive2 { name="statVisual"; version="1.1.9"; sha256="1wf0hgvfynw85zqh4wcmjnysmj8701lxm31bnqyf1kawxjqdxyn4"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma magrittr multigroup pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; };
   statar = derive2 { name="statar"; version="0.7.1"; sha256="0gxchf3mnjvxcp7dg8f1dxbm16hx4ks92z0h0ig7m9l6k6f8adkv"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; };
+  statarepl = derive2 { name="statarepl"; version="0.1.0"; sha256="0byx14mvvigmshd53cxk5wzmfjcky39ywx2km21d2b74s86cb4g5"; depends=[attempt cli crayon jsonlite knitr R6 rlang rstudioapi subprocess]; };
+  statcanR = derive2 { name="statcanR"; version="0.1.0"; sha256="1pyax5lixbpdg99n525w9z44s0zp5xda6ad605c3id0arki9c8xq"; depends=[curl data_table]; };
   statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
   states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; };
-  stationaRy = derive2 { name="stationaRy"; version="0.5.0"; sha256="1h6c7iivjqir45rk6qdfr8driqjliqn09sjdm521kkb3c5qv334r"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; };
+  statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.2"; sha256="04j3f6604psxr7b5fsb8hq6rzqxqydpizhhz2g014apwjzjfd1vc"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; };
+  statgenSTA = derive2 { name="statgenSTA"; version="1.0.2"; sha256="0dm80xx7rqnxnql5x76601i0yy57flfp7ayzm3ia2mwl8h00x02m"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl reshape2 scales SpATS xtable]; };
+  stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; };
   stationery = derive2 { name="stationery"; version="0.98.24"; sha256="06qn3ck2cgcyrx8l27ka1y5dq8hyf01wq3hky6876a5g65b1wax2"; depends=[knitr kutils rmarkdown]; };
   statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; };
-  statmod = derive2 { name="statmod"; version="1.4.32"; sha256="083yyp84xj85zg4bhz7i90bqzl3p6155ch4abwsfc9k1lv7s2rrg"; depends=[]; };
+  statmod = derive2 { name="statmod"; version="1.4.33"; sha256="1fbi5m4c0lingm2vvi0g6jf8f2mg1h01xwyz5rnymrq7gs0ibiks"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; };
   statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; 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]; };
   stats19 = derive2 { name="stats19"; version="1.1.0"; sha256="163v39dvy0gahw2ra0pvri21k02iv9waqb8pv6j55nicvpvha7jm"; depends=[readr sf]; };
-  statsExpressions = derive2 { name="statsExpressions"; version="0.1.1"; sha256="11f3ikrznp21sxk7r8m417f1sad0a7y63g623crvpyjr0cg0zq53"; depends=[BayesFactor boot broomExtra crayon dplyr ellipsis ez groupedstats magrittr MCMCpack psych rcompanion rlang tibble tidyr WRS2]; };
+  statsExpressions = derive2 { name="statsExpressions"; version="0.2.0"; sha256="1m6swfxkifbifrh90dkjr948znfz787bmrsn4s9c0kfnxnkl3fli"; depends=[BayesFactor boot broomExtra crayon dplyr ez groupedstats psych purrr rcompanion rlang tibble tidyr WRS2]; };
   statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; };
   statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; };
-  stcos = derive2 { name="stcos"; version="0.2.0"; sha256="0h6j6nypj6siy6ykkksj9zv89b5jd4gm5vgvncm3h1dxxn2b9mcm"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; };
+  stcos = derive2 { name="stcos"; version="0.2.1"; sha256="1vjz7x9jign82h5kwqcy4jxqjdnhrsgf00dj5m51f6hvvzh3wv5s"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
   stdReg = derive2 { name="stdReg"; version="3.3.0"; sha256="0m907dcgqprnasq17z3wyx7fampsqhwjvg2r0nji5bg9gzag4253"; depends=[data_table drgee numDeriv survival]; };
-  stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; };
+  stddiff = derive2 { name="stddiff"; version="3.0"; sha256="1z6rdchf46aaq0z9bp4dlc4h3swrgyjfdvg40f4lkyg5sgs4sliy"; 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.1.3"; sha256="18q853jmnxir9zcyb6009p2b246v1bi5fy1mcxd0fhbhxvs3s8rx"; depends=[beginr blogdown data_table ggplot2 htmltab httr knitr lattice latticeExtra lubridate mongolite openair plyr purrr RColorBrewer RCurl rjson rlist RODBC shiny stringi stringr tm VennDiagram wordcloud XML zoo]; };
@@ -14010,9 +14029,9 @@ in with self; {
   stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; };
   stepR = derive2 { name="stepR"; version="2.0-4"; sha256="1jv2mv1glzap7nsyxwzil9wif3q3p4y9q0c3kphz49hwwrg20k79"; depends=[digest R_cache Rcpp]; };
   stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; };
-  steps = derive2 { name="steps"; version="0.2.1"; sha256="1ccghvhrbk0d2m1896wbnzf55i1rlvwmdnr5dikr9h9sc79dahla"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; };
+  steps = derive2 { name="steps"; version="1.0.0"; sha256="03f43fbm7k1i3cgyxzfscjxykjnbyy3d9zyc6kqisghlxgkshnkk"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; };
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
-  stevedore = derive2 { name="stevedore"; version="0.9.1"; sha256="0laib1vd9limzvxp2lij414a4mvbbx1j63rx4yzdyh6jiglm8l7h"; depends=[crayon curl jsonlite yaml]; };
+  stevedore = derive2 { name="stevedore"; version="0.9.3"; sha256="00zs2bl5h40rwbhnynjw2jbxlixjnk14rxn9chypqg5zgx9pqg2s"; depends=[crayon curl jsonlite yaml]; };
   stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
   sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; };
   stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; };
@@ -14020,9 +14039,9 @@ in with self; {
   stinepack = derive2 { name="stinepack"; version="1.4"; sha256="0crl77gr4x2bz2zp0a0lqiw5iqlrcx7vj67igkbzg64d1fxai85d"; depends=[]; };
   stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; };
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
-  stm = derive2 { name="stm"; version="1.3.4"; sha256="0w8adswwrdkgv5pc5g2v60r63qhqlg7f4zkcg1x09bi9hc1i6qgv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
+  stm = derive2 { name="stm"; version="1.3.5"; sha256="1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn"; 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.2"; sha256="14d7aivnm2y5cb6wm3cj1fgaqhv0i59jb4khvrjwqihzcnii90x5"; depends=[MASS]; };
+  stmgp = derive2 { name="stmgp"; version="1.0.3"; sha256="0yg2ffvaylhxfclkixk9n1wxigasvirdzdywqg016hjg7w166bp1"; 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.3.0"; sha256="11lhsk7l11bcxsmc7hm8pnwj75634m5gkigr714i16ai2dkvzqpq"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
   stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; };
@@ -14034,7 +14053,7 @@ in with self; {
   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="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; };
-  stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.1"; sha256="16w6si2icpsyhkn0d3l6sh64nj6ynyymp7jxfwa792ds2wrz2mkm"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
+  stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.2"; sha256="08f16a68kmw0r1acs82sha83m04d81b7zdpxjw5g424zbvagwdj4"; depends=[dplyr ggplot2 lubridate maps plyr rlang 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.4.1"; sha256="0kgs3ccyhm2hi8aia7misxwj45c5fy686sqliz7vdk8jayzdsqv1"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringr]; };
@@ -14046,13 +14065,14 @@ in with self; {
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
   stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; 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]; };
-  stratamatch = derive2 { name="stratamatch"; version="0.1.2"; sha256="0lpvz5ma7afyb08d1fn0nsdakpxd4i61vjdr774kx8f2akjrhqf2"; depends=[dplyr Hmisc magrittr rlang survival]; };
+  stratamatch = derive2 { name="stratamatch"; version="0.1.3"; sha256="0mhdxaf2r5aziv9ws01qc15wwwwjjcq7zmlswar9h809vzgpavyi"; depends=[dplyr Hmisc magrittr rlang survival]; };
   stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
   stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
   stratifyR = derive2 { name="stratifyR"; version="1.0-2"; sha256="10qlxkdbym206bvl2wc8ig00fvj1n7553vmjk6rs2n4p945qd47g"; depends=[actuar fitdistrplus mc2d triangle zipfR]; };
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
   straweib = derive2 { name="straweib"; version="1.1"; sha256="0hi59p580yg6rj72grq4jx6grv7lmpi2cimp0rbxhkjpj6i1hav9"; depends=[]; };
+  stray = derive2 { name="stray"; version="0.1.0"; sha256="1pqixk21z1h76672vx5yx9xs6bfacm51fcsgw3911al09zsid6aw"; depends=[colorspace FNN ggplot2 ks pcaPP]; };
   stream = derive2 { name="stream"; version="1.3-1"; sha256="09f26m0fajaw77mb6pk9qkinzkhxpghagd1qhc3nkvcki3vwlcxa"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamDepletr = derive2 { name="streamDepletr"; version="0.1.0"; sha256="0a8cihwjr5bzw5dw07x2kisi4qycwmxpj5hhv9b4pjvfghdwq4b8"; depends=[dplyr magrittr Rmpfr]; };
   streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; };
@@ -14064,7 +14084,7 @@ in with self; {
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
   stringdist = derive2 { name="stringdist"; version="0.9.5.5"; sha256="1dqfakclzaf878x7mhwmqrcpcql2h9cv19fz5f3ygpajf3si5kqi"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; };
-  stringi = derive2 { name="stringi"; version="1.4.3"; sha256="1vbr6g9p1iyzdj7wfw6afyizvnd1a2srfvkl72pq23vhdcwwpkhk"; depends=[]; };
+  stringi = derive2 { name="stringi"; version="1.4.5"; sha256="0gdmdf4i3ik8rcs7af1vlsfnilcmw3z28jx4278rpq2asigps89k"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.4.0"; sha256="1p9ip7p87gbbg4s6d3d392svvzz2b5dqdq2c8ilgvn4s78nlsq47"; depends=[glue magrittr stringi]; };
   strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
@@ -14104,8 +14124,8 @@ in with self; {
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
   suddengains = derive2 { name="suddengains"; version="0.4.0"; sha256="1606lj9x4qlkg5sm7i7xgp8bd2ivzngz0phc7bs06akwd7xbbnra"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
-  sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-0"; sha256="0d530hb4d8i0qziw5iaf5r5c46c9d9ns7n5c1kcb3ffw2c1xi1pl"; depends=[magrittr]; };
-  sugarbag = derive2 { name="sugarbag"; version="0.1.1"; sha256="1wldsqfgw8mqhwikgaasrz7qrnpj51f0kwi9i7v6hil756y5bhjv"; depends=[dplyr geosphere purrr rlang rmapshaper sf tibble tidyr]; };
+  sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; };
+  sugarbag = derive2 { name="sugarbag"; version="0.1.2"; sha256="0aikbcdnwvrwvhcchjic9x1r4xh00z8hzq7dc93ykg4wlggs5rx7"; depends=[dplyr geosphere lwgeom purrr rlang rmapshaper sf tibble tidyr]; };
   sugrrants = derive2 { name="sugrrants"; version="0.2.4"; sha256="04qfa3falpkbdnjks5vd0izjpp5pmc3wf4bkv0ha89ya556306jv"; depends=[dplyr ggplot2 gtable lubridate rlang]; };
   sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
@@ -14142,20 +14162,21 @@ in with self; {
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
   survBootOutliers = derive2 { name="survBootOutliers"; version="1.0"; sha256="1gfh2n1kd1m4bpd1j7islm5ar1qmzycnmfpb8zl8ghv0z5rf5f09"; depends=[survival]; };
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
-  survELtest = derive2 { name="survELtest"; version="1.0.1"; sha256="0dvb7kcdwx8m4rzis08i96cd4i56d1yfapsfgngjla8162glll2y"; depends=[Iso nloptr plyr survival]; };
+  survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; };
   survHE = derive2 { name="survHE"; version="1.0.65"; sha256="0phhcn3gm5l2q8q4j7v8x7bsbk5a8ivqjvyxh45vgh5lrg6zpqg1"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
   survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
+  survParamSim = derive2 { name="survParamSim"; version="0.1.0"; sha256="11rp49wrqw9z4cy2iwm0gn92hi88a0n3jy34b29yj5f9waz0andf"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; };
   survPen = derive2 { name="survPen"; version="1.2.0"; sha256="0x030p6ihw769mjwjxzprmv3nbza0564mh1zfymwn8s94v86ybkl"; depends=[statmod]; };
   survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; };
   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.17.2"; sha256="1gnyylil70qw06fnyhg38xqh9pmzqj5ykf79p66dvhv7zhjq95r7"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
+  surveillance = derive2 { name="surveillance"; version="1.17.3"; sha256="11hzjr85vpmrv11n3prhj9jgjfwvz1fg8xbfz9ql0rrrmycq4jii"; 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.36"; sha256="0xclsy4ram4k48vzh5m5bpmknnpwxnss85v73s4czsjj5ffjxwwh"; depends=[lattice Matrix minqa mitools numDeriv survival]; };
+  survey = derive2 { name="survey"; version="3.37"; sha256="1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy"; depends=[lattice Matrix minqa mitools 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.3"; sha256="0krwzfhjkkjxrpj1xzyaj400xdgbvczi86vjwx4r9g8ys90nvm09"; depends=[assertthat dplyr DT ggplot2 magrittr plyr purrr rlang scales stringr tidyr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
@@ -14164,7 +14185,7 @@ in with self; {
   surveysd = derive2 { name="surveysd"; version="1.1.0"; sha256="0ab1f3z86idv3cy9nycqh4nnkcwachlm27pynlrn6g4jmcvcbj9b"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; };
   survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; 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="3.1-7"; sha256="1ij77bgfcjx29xkx5bck0sv4ybglpcmzzv9ilkinj8fqhhclbs8p"; depends=[Matrix]; };
+  survival = derive2 { name="survival"; version="3.1-8"; sha256="15fj4y8c107bwq22amx88r5hw7qndlcbr9sapzrpkpr7iqz3kkyf"; depends=[Matrix]; };
   survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.1"; sha256="0y4hgskc36jrriy6577bnkvg1gmxs0x3pxiv3lma38a9lj71ivwf"; 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=[]; };
@@ -14189,7 +14210,7 @@ in with self; {
   svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
   svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; };
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
-  svars = derive2 { name="svars"; version="1.3.2"; sha256="160y7i39rsqqccv6j13kdjcf4ma81ca2iirq2vqj45gxyf62m9l6"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; };
+  svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
@@ -14207,7 +14228,7 @@ in with self; {
   swCRTdesign = derive2 { name="swCRTdesign"; version="3.1"; sha256="18ln02fnxkpjqi8a36wr2qr427hxrghkhfjx0384grmdg1mmkbf5"; depends=[]; };
   swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; };
   swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; };
-  swamp = derive2 { name="swamp"; version="1.4.1"; sha256="01w44d7rqh6q9wpapd3g7rzllhbm2brwilmna9vk2dwqx57jyim6"; depends=[amap gplots impute MASS]; };
+  swamp = derive2 { name="swamp"; version="1.5.1"; sha256="1mj6cqrc19p07v051fg6ikhhbccsg2lvz7wjiakaswqqm0269843"; 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]; };
   swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; };
@@ -14216,18 +14237,19 @@ in with self; {
   swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
   swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; };
-  swirl = derive2 { name="swirl"; version="2.4.4"; sha256="1pw0p72gkrv1cy4ck3jfv2j00qzlm44gk61vxl7zn0jb2yrd913r"; depends=[digest httr RCurl stringr testthat yaml]; };
+  swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; 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]; };
-  swissdd = derive2 { name="swissdd"; version="1.0.1"; sha256="101na2c5bzsg4glyss8cj34ihly3yih4n05qbwsm2n5qbda63yxd"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; };
+  swissdd = derive2 { name="swissdd"; version="1.0.2"; sha256="13qzkp73djvdd672na1bjj23yldslyg9z840dblsz0qdkp53d4qz"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; };
+  swissparl = derive2 { name="swissparl"; version="0.2.0"; sha256="1blpaj8mbhnyb4bajh9h91h7pc2zz8gmzdag5faqfqr4rfnk0582"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; };
   switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; };
   swmmr = derive2 { name="swmmr"; version="0.9.0"; sha256="1iv9dmgpjfl7yzjlph42bamnwchjdic6n0lgs33z0incvgsv3m3g"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
   sybil = derive2 { name="sybil"; version="2.1.5"; sha256="1biy1cc87g7adfglzp2mq6ca5sfp1ljq087id0xqdmrwz0650maq"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
-  sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.0"; sha256="0kv66c70vh8jq9xad459lmskkw8bar2zlrws2fqdjf4ww064ymgp"; depends=[Matrix sybil]; };
-  sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; };
+  sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; };
+  sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.1"; sha256="0j1qmf5apb6k0ga5ki7wxbbq1k8x7kv8wcnf85zcx0117fjkxfng"; depends=[MASS Matrix sybil]; };
   sylcount = derive2 { name="sylcount"; version="0.2-1"; sha256="0a5762cy2h4vhy35z88l9i4ny30zpj5bvmmw3n5xzz275hsd3piw"; 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=[]; };
@@ -14238,11 +14260,12 @@ in with self; {
   symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
   symmetry = derive2 { name="symmetry"; version="0.1.1"; sha256="1f4l058sdrdg7jl1rklyd0a3ik9lnnsf2imgaymr56iaxn7y0m79"; depends=[Rcpp RcppArmadillo Rdpack]; };
   symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
+  syn = derive2 { name="syn"; version="0.1.0"; sha256="12apdjbsazwfxizsw4dj0y3vkdjmki8dzpyv3bi9gnhpysdd1jzx"; depends=[]; };
   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.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; };
-  synchrony = derive2 { name="synchrony"; version="0.3.7"; sha256="0lnin4aphy1lq20bn7nsdj0ymy2xdwjzdj2f89xq0qwkc7w7b5jb"; depends=[]; };
+  synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; };
   synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; };
   synoptReg = derive2 { name="synoptReg"; version="0.2.2"; sha256="0s3m7basw71gliy22c599ysj5s068ki20i8031yrrbdhif8zhbqg"; depends=[ncdf4 raster zoo]; };
   syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; };
@@ -14251,7 +14274,8 @@ in with self; {
   sys = derive2 { name="sys"; version="3.3"; sha256="14wvy46i2iz9jn7lj3cvifmps932s3395wq681hniva0f8m7q8d6"; 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]; };
+  syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; };
+  systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; };
   systemfonts = derive2 { name="systemfonts"; version="0.1.1"; sha256="0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"; depends=[]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; };
   syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; };
@@ -14273,9 +14297,9 @@ in with self; {
   tables = derive2 { name="tables"; version="0.8.8"; sha256="1cgfwrnmgi1jhv9kj918mv0ib75hvprqjg0nb7ppih73kqpaw5m2"; depends=[Hmisc knitr]; };
   tableschema_r = derive2 { name="tableschema.r"; version="1.1.0"; sha256="0ny683p9kaidj5bayz77hyvsaqg3jk87pb95271znk8hzhl2jlcj"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; };
   tabplot = derive2 { name="tabplot"; version="1.3-3"; sha256="0gv27igixcy5vqrk71ckyhlk4yhcprm8r2a2l0lgmn4rbsm20c6h"; depends=[bit ff ffbase]; };
-  tabr = derive2 { name="tabr"; version="0.3.5"; sha256="14lsqkn5xzxmnh23ppmv9b0pkqiyw82b2nnmnv56cpgv2ds6bv4h"; depends=[crayon dplyr ggplot2 magrittr purrr tidyr]; };
+  tabr = derive2 { name="tabr"; version="0.4.0"; sha256="08f9v7mk9b9x2nk8n3nqgwikkay6ip14awljvgjl30nifbbswxsv"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
-  tabula = derive2 { name="tabula"; version="1.3.0"; sha256="12fqkqky2amg9lzm7q1dc7j2i71cbm1mdpzgfkyjwgjkv87b896k"; depends=[ca ggplot2 rlang]; };
+  tabula = derive2 { name="tabula"; version="1.5.0"; sha256="0ijamh5lhgaa202ka1kp78i583616rc9w4zay8gx7c3gkjppfpdx"; depends=[arkhe ca ggplot2 rlang]; };
   tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; };
   tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; };
   tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; };
@@ -14284,7 +14308,6 @@ in with self; {
   tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
   tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.1"; sha256="0xqvg73l00kskgg7ipcc19rvi9n5ylwnaph5g5x8iwgim5dhcb9s"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
-  tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
   tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; };
   taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; };
@@ -14303,16 +14326,17 @@ in with self; {
   taxa = derive2 { name="taxa"; version="0.3.2"; sha256="1kiffyfpgapap6m2k3wx7p89kzpdyk48nwbmqvfa883kvg0ddzcy"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; };
   taxize = derive2 { name="taxize"; version="0.9.91"; sha256="0ncglmj0nzk60dvmngzskr2psn0bi2wj8jr628kczln2qz2hagff"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn plyr R6 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.6"; sha256="0p68izdhqggra14g6n93124qnwrxmdy5f9x0617fmix5yc23rww3"; depends=[foreign stringdist taxize vegdata]; };
+  taxlist = derive2 { name="taxlist"; version="0.1.7"; sha256="0a91hdw3n46p851662lx82znbw9hf9akg8mm4yslllwffrkhdn8g"; depends=[foreign stringdist taxa taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; };
   taxotools = derive2 { name="taxotools"; version="0.0.35"; sha256="10rf071sarr94q5g174y97sl9qjlla7jgn4hplllv6s1wh10ag7c"; depends=[plyr sqldf taxize wikitaxa]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
   tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
-  tbm = derive2 { name="tbm"; version="0.3-1"; sha256="1nakiixh833jwfz5zp3kz9zc09373zd8ydy94x4v9vxxwqp3zvl5"; depends=[basefun coneproj mboost mlt sandwich variables]; };
+  tbm = derive2 { name="tbm"; version="0.3-2"; sha256="0kaqbyrazkl8gv0jl5n14zdlc4csmj1llmwgp068k79m2bacjmkq"; depends=[basefun coneproj mboost mlt sandwich variables]; };
   tbrf = derive2 { name="tbrf"; version="0.1.3"; sha256="1g6ll9vqhszas3czpnvvxhrih4b1h10dhn40ljh4206m27mzl8v9"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; };
   tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
+  tcensReg = derive2 { name="tcensReg"; version="0.1.5"; sha256="0sk884pxgr7m46c1lbpji4hr6ch3ia6vygg1z988c21q219is76j"; depends=[maxLik]; };
   tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; };
   tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
@@ -14321,7 +14345,7 @@ in with self; {
   tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
   tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; };
   tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; };
-  tdsc = derive2 { name="tdsc"; version="1.0.2"; sha256="19wd7gbpb23x55jzp0snnqm8ccnga3bfgr0mbhh31frkf6453721"; depends=[data_table moments]; };
+  tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; };
   tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; 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]; };
@@ -14330,10 +14354,10 @@ in with self; {
   teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; };
   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.1"; sha256="05qnnp7bsv6q9230kikwk1r80f6v809cc2nv117w08nax4423vwx"; depends=[abind coda cowplot doRNG dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules SDMTools sp stringr]; };
+  telefit = derive2 { name="telefit"; version="1.0.2"; sha256="0z4dg0am0b6h20vbjzggw2jyzmi0mf9hvj48f883wkg2p7m6d67m"; 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="2.4.0"; sha256="1bvfnr6k0zxdawrf63yh8wj9hcgq1xvy791xbqhiy0isaa86yfw9"; depends=[curl httr jsonlite R6]; };
-  tempR = derive2 { name="tempR"; version="0.9.9.15"; sha256="00xxrwzbqcsvb50xcrr4aii4fjcfa8bc25jn0zvg4dxmww8w4s1r"; depends=[]; };
+  tempR = derive2 { name="tempR"; version="0.9.9.16"; sha256="0kwrjpfij36dl98j5x09hp7bzf5v17zxdjzqhjd2sn3xsdf0z5a1"; depends=[]; };
   tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
   tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; };
   temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; };
@@ -14350,6 +14374,7 @@ in with self; {
   tensorsparse = derive2 { name="tensorsparse"; version="1.0"; sha256="1qy6s58nkqq4spg7sapq3jafmxda0mx0j0cqjaj9pd34qqxifglf"; depends=[clues fields glasso glmnet HDCI mvtnorm RColorBrewer reshape rgl rTensor viridis]; };
   tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; };
   tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
+  term = derive2 { name="term"; version="0.1.0"; sha256="16nphv6kysjjd523ypwdsw6f7l4zvqa6z62012lv71wdkhkfvgnr"; depends=[chk lifecycle]; };
   ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; };
   tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; };
   test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; };
@@ -14357,16 +14382,16 @@ in with self; {
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   testequavar = derive2 { name="testequavar"; version="0.1.2"; sha256="12qfy53rkrasxphcfmch5bmdlvlybd27jfg3azsi3fg4zk4qgdw2"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
-  testextra = derive2 { name="testextra"; version="0.1.0"; sha256="0n5d3a4fnqb9bc47sha5zyi18gd9k6hm1jkjlb7apk43zry6n0y8"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; };
+  testextra = derive2 { name="testextra"; version="0.1.0.1"; sha256="166lg012hgk5n4zp92dagx01bjhpkjgc5i40x9fc9nfjby0wrc0s"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
   testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; };
   testthat = derive2 { name="testthat"; version="2.3.1"; sha256="0m8xchdpgn9iwj6gb2qw46zr85v9zf1gkbr9nnahmy5sp1s9bbky"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; };
   testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot 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.4.1"; sha256="0vjplajgrzz97a9lrrx43vx05djyi5dq22l6smjywn7m1ij6c9gv"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; };
+  texPreview = derive2 { name="texPreview"; version="1.4.3"; sha256="19qnfjdbm6iakbls4hyrjscl7m7dc7z0fhimf71gwdbq3nqx2zl1"; depends=[base64enc fs htmltools knitr lifecycle magick magrittr 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=[]; };
-  text2speech = derive2 { name="text2speech"; version="0.2.5"; sha256="0wc9c6sgv2p6qq8n9cmf143gn8ijps5ncwnkjq3q8m7558m6f24j"; depends=[aws_polly aws_signature dplyr googleAuthR googleLanguageR httr magrittr mscstts tuneR]; };
+  text2speech = derive2 { name="text2speech"; version="0.2.9"; sha256="1gcyrq3faq3zsfr7bvwhqk1l93289gzx70bg6xdyagw99jz5k5wn"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; };
   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.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; };
@@ -14387,37 +14412,39 @@ in with self; {
   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-11"; sha256="12vx89k49js7k7h2ay1qx345infr5gns8bhvlm3jinrm9saj0f54"; depends=[]; };
+  textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; };
   tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; };
-  tfautograph = derive2 { name="tfautograph"; version="0.1.0"; sha256="0bia0hqwwhf2iwbzy6wa9r72fl00k8pm5ll74bb9w372r129i5wh"; depends=[reticulate tensorflow]; };
-  tfdatasets = derive2 { name="tfdatasets"; version="1.13.1"; sha256="19szgpb040v33hicrqdigjpg3z6jph0fxx6rh8ln16hk4sb2rd2d"; depends=[magrittr reticulate rlang tensorflow tidyselect]; };
+  tfautograph = derive2 { name="tfautograph"; version="0.2.0"; sha256="1jpimmlsihr78v56v9mp51grmvwa198a1inahihk3yj02wzfqizj"; depends=[reticulate tensorflow]; };
+  tfdatasets = derive2 { name="tfdatasets"; version="2.0.0"; sha256="1fw2qa7hh6z2gxib2ym4cqv4kp8y918mgi3yb4vgjd2pi0dbvksr"; depends=[generics magrittr reticulate rlang tensorflow tfestimators tidyselect]; };
   tfdeploy = derive2 { name="tfdeploy"; version="0.6.1"; sha256="1vbxyvmzaafbwp1pmvzn16zyl4nz85787m79gn7iazh9zw9f7j34"; depends=[httpuv httr jsonlite magrittr reticulate swagger tensorflow]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
   tfestimators = derive2 { name="tfestimators"; version="1.9.1"; sha256="0da34iy7fyfzhbvaj8494sl6nrmhcfbqcr71l95ziaxgb8285ndm"; depends=[forge magrittr progress purrr reticulate rlang tensorflow tfruns tibble tidyr tidyselect]; };
-  tfio = derive2 { name="tfio"; version="0.4.0"; sha256="1ah37sf3qf099bv50gsz1ny13vrp67ry0famabihc5kmqk9viyhg"; depends=[forge magrittr reticulate tensorflow tfdatasets]; };
+  tfhub = derive2 { name="tfhub"; version="0.7.0"; sha256="1a4iasasfbd44hljxkf2a76j1nb6l6jmijw8f52h5m00m8arfh2i"; depends=[magrittr reticulate rstudioapi tensorflow]; };
+  tfio = derive2 { name="tfio"; version="0.4.1"; sha256="089vh0k12z0ymk4v585hfnl5yqp28rgzqgy633m874h6fqzhhxvp"; depends=[forge magrittr reticulate tensorflow tfdatasets]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
   tfprobability = derive2 { name="tfprobability"; version="0.8.0.0"; sha256="1h32r15yxxzmvqp0gs2k5m2c6z1jkgfwj757sl6pfhwpr7av9zqp"; depends=[keras magrittr reticulate tensorflow]; };
   tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; };
   tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; };
   tfruns = derive2 { name="tfruns"; version="1.4"; sha256="1mqv5m13qm1dqz0622jd5ayb3nk76lfa657y2hyqv261flxizhvg"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; };
   tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; };
+  tgcd = derive2 { name="tgcd"; version="2.3"; sha256="1wl5lp1kbibdppfpjr41m1mzh72s22v5hcrjiwhc5sp59mynl4s3"; 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]; };
   tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; };
   thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; };
   thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; };
-  theiaR = derive2 { name="theiaR"; version="0.2.0"; sha256="1zvgg3xs1xlmg7gkv7pax7w5xgarvya4nvv4d78iv7p02bzckbxv"; depends=[askpass httr R6 raster tiff XML]; };
-  themetagenomics = derive2 { name="themetagenomics"; version="0.1.0"; sha256="1p8qyvll6a9yx2akny1087f73r6p5zi6cf1si7b8i786bcs9khwj"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; };
+  theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; };
+  themis = derive2 { name="themis"; version="0.1.0"; sha256="1hsrm8z9fh8smzw9yda8j32zq9warnpy6rihyni0zwchgp3iyawq"; depends=[dials dplyr generics purrr RANN recipes rlang ROSE tibble tidyselect unbalanced withr]; };
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
   theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; };
   thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
   thickmatch = derive2 { name="thickmatch"; version="0.3.0"; sha256="0j5wajrc0ngmal01hnfw6vbqvmnqfrgii68ws8ypig934h2kv05g"; depends=[DiPs liqueueR mvnfast plyr rcbalance]; };
   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.1.0"; sha256="0ard98z5kb9r6k4qvnbqq4mx4x6ydhd4b6ppzrp19yilvdb8wgjp"; depends=[R6 storr]; };
-  threeBrain = derive2 { name="threeBrain"; version="0.1.4"; sha256="1lp1wy7c9927156nvchah7rhdgblfg8vx178k106nhaa1a56in04"; depends=[base64enc crayon gifti htmltools htmlwidgets jsonlite oro_nifti R6 reticulate shiny startup stringr]; };
+  thor = derive2 { name="thor"; version="1.1.1"; sha256="1hkv7xd633qqcgfm16ws6hn26ab0mv5gqs6n8g7cq1qv57dsqjmm"; depends=[R6 storr]; };
+  threeBrain = derive2 { name="threeBrain"; version="0.1.5"; sha256="1ms7j1xaxlyw87f53p5gmmkabm9plh7qk0jpp6qav8yy5z93xggm"; depends=[base64enc crayon digest dipsaus freesurferformats gifti htmltools htmlwidgets jsonlite oro_nifti R6 reticulate shiny startup stringr]; };
   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]; };
+  threejs = derive2 { name="threejs"; version="0.3.3"; sha256="1711h351nzxfkbbdwvfzyhciyvi9c6wx3jq1g97lzcqgnb45kivn"; 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]; };
@@ -14432,32 +14459,33 @@ in with self; {
   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="1.0.4"; sha256="154jikhm1dnriwdib5ncmkjixlihs3b74ilpi225h8ijq84n31ai"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; };
+  tidyREDCap = derive2 { name="tidyREDCap"; version="0.1.0"; sha256="177jrkd415rl7cz0vyank2bxiqkywcrva8xi8j2hyi6j6hkf0m6a"; depends=[magrittr purrr stringr tibble]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
-  tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.4"; sha256="0mlvjrhrbnvck7d1ml48yzaq4gks5m5r9cdnz8kqvaffwjwbyr2q"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; };
+  tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.5"; sha256="035x8aw96as2848j2if9v0d36zpjvybqkbb1wb04hpi92a6bm8fx"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; };
   tidybayes = derive2 { name="tidybayes"; version="1.1.0"; sha256="1mq6gqr66pqrwdmnk3fmfi508ds086k7jnlazi5mczn4r6pdyzd7"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval magrittr plyr purrr rlang tibble tidyr tidyselect]; };
   tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
-  tidycells = derive2 { name="tidycells"; version="0.2.1"; sha256="161g06ga4wk1sn2qp9ljjq9mrjmvwl2dcs1nc352alk6p7bjbj8p"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tibble tidyr unpivotr]; };
-  tidycensus = derive2 { name="tidycensus"; version="0.9.2"; sha256="0dlm5f24rw7zyf5wx1v1rsx1zkkff1c4zqgbysm9xzya059m4m14"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
-  tidycode = derive2 { name="tidycode"; version="0.1.0"; sha256="16chz6bbj28aa039s57j48qa5fhj9hlj8ijsqmbfp5ib8bnijgc4"; depends=[glue matahari pryr purrr rlang tibble]; };
+  tidycells = derive2 { name="tidycells"; version="0.2.2"; sha256="1h1g2kw4q0qgakj716gzd8jcn0hgsy5l1cypk35s6arz73xrxf0r"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tibble tidyr unpivotr]; };
+  tidycensus = derive2 { name="tidycensus"; version="0.9.5"; sha256="0scp32d50chjvc68qp77psx7jzjdv3v4sq33lli89f2hq200ql4f"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
+  tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; };
   tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; };
-  tidycwl = derive2 { name="tidycwl"; version="1.0.3"; sha256="0m92g6ykglpdygb41jacixanzwrn60lk8az0ygs6diffikyv8sk3"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; };
-  tidydice = derive2 { name="tidydice"; version="0.0.4"; sha256="01ahmyk7jpsp03kffazy2b73i5z6466jh7y66flpqk5jyszghyr2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; };
+  tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; };
+  tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; };
+  tidygapminder = derive2 { name="tidygapminder"; version="0.1.0"; sha256="1fr4yrq7hzzllkclf7cwicfjwg5gcf5la0chc8mah7690lkdi39b"; depends=[data_table dplyr readxl tidyr]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; };
   tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.4"; sha256="0r37s3hfyqz4zqs7cwp72dhc6f1y7zfc22v9b0705bdbqnfllahn"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; };
   tidygraph = derive2 { name="tidygraph"; version="1.1.2"; sha256="1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; };
   tidyhydat = derive2 { name="tidyhydat"; version="0.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; 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]; };
   tidyjson = derive2 { name="tidyjson"; version="0.2.4"; sha256="1nbg7wg8r38ydvcp3kbxmmnayxrdkl3p7x0fjxny3bj9a0fp99y7"; depends=[assertthat dplyr jsonlite magrittr purrr tibble tidyr]; };
-  tidylog = derive2 { name="tidylog"; version="0.2.0"; sha256="04l9bjfjnc706ya19swywr489wldkr7n9cm6kkyws56kqb571zxv"; depends=[clisymbols dplyr glue tidyr]; };
-  tidymargins = derive2 { name="tidymargins"; version="0.1.0"; sha256="1r782h6a5fhk9yb9ixjbpq3a9g56j3xz1871fsndkfigbzz39w51"; depends=[assertthat dplyr forcats magrittr pkgcond purrr rlang tidyr tidyselect]; };
+  tidylog = derive2 { name="tidylog"; version="1.0.0"; sha256="12civvsgj9d7ligc84sqii6a8q3ll12b8xs99f6rqp4nhzhpavv3"; depends=[clisymbols dplyr glue tidyr]; };
   tidymodels = derive2 { name="tidymodels"; version="0.0.3"; sha256="07l33slvh38lpycz2v4slwz06v33ni9jqr5wv672gzcgirw5xy7p"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; };
   tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; };
   tidync = derive2 { name="tidync"; version="0.2.3"; sha256="1wjw3fmyj8f95f94zai58h8b6h0vqqlrw4c629jjgg8ayy7aay9p"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; };
   tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; };
   tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
   tidypredict = derive2 { name="tidypredict"; version="0.4.3"; sha256="1mn14rd33irgcfrhm9d3zd71jdwdjay5z5xsmas8d9zmf05g0bcr"; depends=[dplyr generics knitr purrr rlang tibble]; };
-  tidyquant = derive2 { name="tidyquant"; version="0.5.8"; sha256="1wg2r2197j846kapra58z51r6xgp38g0m6rb3dvmz5awlkb9mdz8"; depends=[cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang rstudioapi stringr tibble tidyr timetk TTR xml2 xts]; };
-  tidyquery = derive2 { name="tidyquery"; version="0.1.0"; sha256="0jbkzm2vlzjfwn1849skkinywh7xa0n772qyrdhya7cg53xqp5vd"; depends=[dplyr lubridate queryparser stringr]; };
+  tidyquant = derive2 { name="tidyquant"; version="0.5.9"; sha256="013yxg3wqvrl7ybda8lxil7cvzzlllb9f2l107867c7af9fbf7vy"; depends=[cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang rstudioapi stringr tibble tidyr timetk TTR xml2 xts]; };
+  tidyquery = derive2 { name="tidyquery"; version="0.2.0"; sha256="1qhiqaijw71lqv2lffsisk53mvxckr7jj6qxvg9l3wygmhskzkvw"; depends=[dplyr lubridate queryparser rlang stringr]; };
   tidyqwi = derive2 { name="tidyqwi"; version="0.1.1"; sha256="0qrwclaz6cf2wg3rkg2nqjygflj0a1mx4cfbv5lx4r194km2dmr9"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; };
   tidyr = derive2 { name="tidyr"; version="1.0.0"; sha256="1403j0xd93l0r7qj738ryd5zc79hbcghrzybib3c3hrnaq5s78cj"; depends=[dplyr ellipsis glue lifecycle magrittr purrr Rcpp rlang stringi tibble tidyselect vctrs]; };
   tidyrules = derive2 { name="tidyrules"; version="0.1.0"; sha256="1pwbgk48rrxcxwjnqfjg4718fw059h4qh3vfni8psgd5snfbsjql"; depends=[assertthat magrittr partykit purrr stringr tibble]; };
@@ -14468,7 +14496,7 @@ in with self; {
   tidytext = derive2 { name="tidytext"; version="0.2.2"; sha256="1h1fpy86fha3jidb1xz0n3mfn7110mmf3dz9hpyfczqpyd62k3qq"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
   tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; };
   tidytransit = derive2 { name="tidytransit"; version="0.6.1"; sha256="0gm33d73k5rygdk6waaqlknkm65gg5xc6w85m3qhllch2akphh1j"; depends=[assertthat data_table digest dplyr hms httr lubridate magrittr readr rlang sf tibble tidyr zip]; };
-  tidytree = derive2 { name="tidytree"; version="0.3.0"; sha256="1sbfwcxf9v1lhpa0392b49b6qfjrq7nlqz2djqzk5aknj9j64zvy"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
+  tidytree = derive2 { name="tidytree"; version="0.3.1"; sha256="1bnzs62z2l8ck2h9gabmxvayizv4nfn8dmyzry83fv0cspjbyiv7"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
   tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
@@ -14478,7 +14506,7 @@ in with self; {
   tigger = derive2 { name="tigger"; version="0.4.0"; sha256="1ns4shv4aaxlgahy9vy3wxxrnrz4zb0w40fcsldmh5jrvbxhhsb6"; 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.8.2"; sha256="03hlwykm14j8il53yslii8npfr42plj87maq120crhijafr6m3gd"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
+  tigris = derive2 { name="tigris"; version="0.9.1"; sha256="1vwnxw4pg15pn87cz6f3ncfn1f145svikn8y2sphyvp0x7cid53x"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
   tikzDevice = derive2 { name="tikzDevice"; version="0.12.3"; sha256="1d8cxb3srmfv54c61c25myiknkm43ysl69lqjknhaj682x0nyz2r"; depends=[filehash png]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
   tiler = derive2 { name="tiler"; version="0.2.4"; sha256="1j1952vp0gnx0pnhqydipj4qw3cm05im502jc77wb2r1vklwimgb"; depends=[png raster rgdal sp]; };
@@ -14486,16 +14514,16 @@ in with self; {
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
   timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; };
   timeR = derive2 { name="timeR"; version="1.1.0"; sha256="0ksdfk0hchphhixllix4wnm1ig46215093i2jvqlcrkqnx5v2zbz"; depends=[lubridate R6]; };
-  timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
+  timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3042.102"; sha256="185hmd70hida6i12mxbrccapkpwb6jhf6cmcfbz8bc3sv9h3q5gs"; depends=[timeDate]; };
   timechange = derive2 { name="timechange"; version="0.0.1"; sha256="054zh151am6asadj39nz3l4s37kip0bcjwg8mw59s78s5gyjbwds"; depends=[Rcpp]; };
   timedelay = derive2 { name="timedelay"; version="1.0.8"; sha256="18f8x3lxhh954vn75gjg27iwyi81x7ajh1xh0bxafs7qivnimxvm"; depends=[MASS]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
-  timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; };
+  timelineR = derive2 { name="timelineR"; version="1.0.0"; sha256="01bb4201p18l1l5yp622ml9zd8spc978hvhw1s7j57qki5rw4kdf"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR rlang stringr]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
   timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; };
-  timeperiodsR = derive2 { name="timeperiodsR"; version="0.2.0"; sha256="04m4dgz8xxvrpqhiz7rnf8in2cdbms9xj740p969zgybp1vlww7x"; depends=[lubridate]; };
+  timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.1"; sha256="11dm8qp0887p8fnr12qvmidhk6wibqg2gszn73j9825d3csh2x9g"; depends=[lubridate]; };
   timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; };
@@ -14510,7 +14538,7 @@ in with self; {
   tinter = derive2 { name="tinter"; version="0.0.1"; sha256="1zw5a79mryqighf8b6gidsi30001749sllpwqwbck26cyal6m8y6"; depends=[checkr]; };
   tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; };
   tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; };
-  tinytex = derive2 { name="tinytex"; version="0.17"; sha256="0mgxrbj4gam2gvxfk26nq820vsfjggj81m2l7j9m8vp361k15r0w"; depends=[xfun]; };
+  tinytex = derive2 { name="tinytex"; version="0.19"; sha256="0jlcrvcqcbkimg7w40z5vhlnakb829vfgqpspm3pfl8karwzgqp6"; 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]; };
@@ -14526,9 +14554,9 @@ in with self; {
   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]; };
-  tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.0.0"; sha256="0qfpmh8kbakx7am64pvlcfw5w33p72c15gj53chmyc119l4vv1lg"; depends=[BH Rcpp RcppEigen]; };
+  tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.0.1"; sha256="18xjzqh9zr5lfmwmcqiq4zn9k7b8q75z76im5qy6av7r2qz1n75m"; depends=[BH Rcpp RcppEigen]; };
   tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; };
-  tm = derive2 { name="tm"; version="0.7-6"; sha256="0spv43kjbpxq3rdxx8ysgrncjyc35ydiwk7gp8n4sig45iqyz59r"; depends=[BH NLP Rcpp slam xml2]; };
+  tm = derive2 { name="tm"; version="0.7-7"; sha256="0pyics8j7a4wkh5gzin46l0qars5vgbb1886xqpdqjs1z0gy9nyh"; 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]; };
@@ -14537,7 +14565,7 @@ in with self; {
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
   tm1r = derive2 { name="tm1r"; version="1.1.3"; sha256="1r1va052aaya70pvvn950833w0q0sbd67yyg3m2qdikgniq3dn6z"; depends=[httr jsonlite]; };
-  tmap = derive2 { name="tmap"; version="2.3-1"; sha256="1d4n5mn7hdyjmmxsprjn9hih0bkg9hsc6vh6rxlgjrjcpv3xcn2s"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; };
+  tmap = derive2 { name="tmap"; version="2.3-2"; sha256="01v4z73xpxpg87daka2vcy1gj170qjg7qdl44vrfjrxib46cn2fa"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; };
   tmaptools = derive2 { name="tmaptools"; version="2.0-2"; sha256="1n8m4c3q7i60p8r2xfhw8rfqmflyaicf8y1bkfkmx74afz6hv184"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; };
   tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
   tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; };
@@ -14563,7 +14591,7 @@ in with self; {
   toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; };
   tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; };
   topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; };
-  topicmodels = derive2 { name="topicmodels"; version="0.2-8"; sha256="19msp5cz67ff4v1gfd8vhjnnsmwfkxiv08ym4k506j2mhaklipci"; depends=[modeltools slam tm]; };
+  topicmodels = derive2 { name="topicmodels"; version="0.2-9"; sha256="1757r5x8bsl4dk106xg6481mvdkdz9vwg87n7rpbvdkavsvhyxs0"; depends=[modeltools slam tm]; };
   topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; };
   topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; };
@@ -14571,7 +14599,7 @@ in with self; {
   tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; };
   tosca = derive2 { name="tosca"; version="0.1-4"; sha256="1c7x89b2vh2xl5bc1xgclmnk2gajqalxmz4ipqlwp9axz91w85gs"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
-  totalcensus = derive2 { name="totalcensus"; version="0.6.2"; sha256="1z0awdzi93r4mmaymdahansss7ccb0y3ym1sqja0jr3dx71zy4jn"; depends=[data_table magrittr purrr stringr]; };
+  totalcensus = derive2 { name="totalcensus"; version="0.6.3"; sha256="0489bzc8y4zgs4rpd52xbc2hm7g0y46j40f5bmqp5h56aq259jsa"; depends=[data_table magrittr purrr stringr]; };
   touch = derive2 { name="touch"; version="0.1-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; };
   touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; };
   tourr = derive2 { name="tourr"; version="0.5.6"; sha256="028pbprq1hjfbzvybpdkwi49arsg9r7ayjb52flw33szfqdpcimw"; depends=[MASS]; };
@@ -14584,15 +14612,14 @@ in with self; {
   tracerer = derive2 { name="tracerer"; version="2.0.2"; sha256="0xh95qrd63s04zs69fcrmvwscn153qlpw2xlkzn8h6jwsd92amv9"; depends=[jsonlite Rcpp testit]; };
   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.5"; sha256="12p6pg2gvqa55j9sxfvdjc3ah00w0av5cpmi400szkc2lr1gpb9s"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
+  trackdem = derive2 { name="trackdem"; version="0.5.1"; sha256="06vhgm5sqafx90isfxq71gz82zznyjvl63rqyg5rx22syqsh4mbi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; };
   trackdf = derive2 { name="trackdf"; version="0.2.1"; sha256="18kiwbrfalj19gjp2v3yhxlmc6liw5scfnwx2svq5f5h3h54a7iz"; depends=[data_table lubridate rgdal sp tibble]; };
   trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; };
   trackeRapp = derive2 { name="trackeRapp"; version="1.0"; sha256="05r012kcf86j45q00y6ynz9srd0by45w41bpx9mf7q4h8m5nm0jn"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; };
   trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; };
-  trackter = derive2 { name="trackter"; version="0.1.0"; sha256="19fjxih3pgiz054x7lind5njc6ddxiq6qh9fnh42i5qplfgrlgk8"; depends=[animation data_table dplyr EBImage features ggplot2 jpeg Momocs pastecs plyr raster wesanderson zoo]; };
   tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; };
   trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; };
-  tradestatistics = derive2 { name="tradestatistics"; version="0.2.5"; sha256="0y6xyba3lr7mdd8q4ar8x7v8shkknbd0qhkvnz2ad9kfbwbxv7v1"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; };
+  tradestatistics = derive2 { name="tradestatistics"; version="0.2.7"; sha256="1pl8qrzf4dx1pcyrhf2rzp5wrfdgv6azlpi83wy5w078ckm2hly3"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; };
   trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; };
   traineR = derive2 { name="traineR"; version="1.0.0"; sha256="0m0k9hxdpx8dzxdy8i0k2rqmibm78fkw8fykkm5r56g7zjh3b7g0"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; };
   traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; };
@@ -14602,13 +14629,14 @@ in with self; {
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; };
   trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; };
-  tram = derive2 { name="tram"; version="0.3-1"; sha256="1qpnm498w5z9qhmhhh5dvm76hcdiv60s10njl8w9dhl0ljd21x68"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; };
+  tram = derive2 { name="tram"; version="0.3-2"; sha256="043j8f2vhbm4alr47bv0ghv4358ckvd74hnlq8516b6is3ll1h72"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; };
   tranSurv = derive2 { name="tranSurv"; version="1.2.0"; sha256="0r698s2yg7ypyzid52a46p0bhl3xi4rh50bfnx0pacc65rigjr6f"; depends=[SQUAREM survival]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
   transformr = derive2 { name="transformr"; version="0.1.1"; sha256="186n789zzf2p9ggw9j7gmd4knfq051jhl35x1585jgll2karyn2c"; depends=[lpSolve Rcpp rlang sf tweenr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
+  transplantr = derive2 { name="transplantr"; version="0.1.0"; sha256="0gzx4xmps1n8363q1y34gjgh48rnzh2ww19d6qg7q12mli2biz92"; depends=[]; };
   transport = derive2 { name="transport"; version="0.12-1"; sha256="04ds3i372ri0w3qy1nn6gjrhip89978zbpvi9c5dlsbh8wwk583l"; depends=[data_table Rcpp RcppEigen]; };
   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]; };
@@ -14617,7 +14645,7 @@ in with self; {
   tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.0"; sha256="17yci49zsz05ydjzs0zbz8xg2vdjmh8xq6cfxchrq488kvjyjzsz"; depends=[Rcpp RcppArmadillo]; };
   treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; };
   treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
-  treeHMM = derive2 { name="treeHMM"; version="0.1.0"; sha256="1iasvqfy62psj7md9sv97hqm1lcvkiw1qapsfsjcc6bdx5zflnxq"; depends=[future gtools Matrix matrixStats PRROC]; };
+  treeHMM = derive2 { name="treeHMM"; version="0.1.1"; sha256="1chg1y26x4nm2wm2nsqw51lx2w8b89wdq8ywh1l03xhw8lgdsv47"; depends=[future gtools Matrix matrixStats PRROC]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
   treeclim = derive2 { name="treeclim"; version="2.0.3"; sha256="03d734zxz4vjrx7xw9r8y8lcsacn0p92q09n05vqfx4p7wvpwp26"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
@@ -14626,21 +14654,21 @@ in with self; {
   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.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; };
-  treenomial = derive2 { name="treenomial"; version="1.0.0"; sha256="1052f4k96p6849y9jsqjirqqbgg7kaabxh6f7fwflp7g8y6jkyd2"; depends=[ape Rcpp RcppArmadillo RcppThread]; };
+  treenomial = derive2 { name="treenomial"; version="1.1.1"; sha256="13dsls2x3nlsdqs8whr7yq8gkacw3rzrvcbj47vkwqcpbgk2xwi8"; depends=[ape Rcpp RcppArmadillo RcppThread]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
   treeplyr = derive2 { name="treeplyr"; version="0.1.7"; sha256="11y15dslalwifarz79zyc5vxszyajkjyzm98p0w1n8gfr6lrq9yy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
-  treespace = derive2 { name="treespace"; version="1.1.3.1"; sha256="0wnzc4fw23yi28a5hdl381kbkqxsqwyq3b3ljw1hfy89rpyy2v8c"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
+  treespace = derive2 { name="treespace"; version="1.1.3.2"; sha256="18xqvqpcknvwdvl84jskcwmsw3alcwns0d35a8paalwjkix03175"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
   treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; };
   treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; };
   trekcolors = derive2 { name="trekcolors"; version="0.1.1"; sha256="1fw2wgkkky79vy9sc3cn42vmfcdnsjsnhb81wvalwi6ww64fzrkh"; depends=[ggplot2]; };
   trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; };
   trelliscopejs = derive2 { name="trelliscopejs"; version="0.1.18"; sha256="1i13l3a74cxppkffzbpnyh2faqdwj3gy55s4s0fck1fwpvlkn5zr"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
-  trend = derive2 { name="trend"; version="1.1.1"; sha256="1bd567n15k2vpmgbx02584k5kglrc58mlb5kgd07wdss3knpa48q"; depends=[extraDistr]; };
+  trend = derive2 { name="trend"; version="1.1.2"; sha256="09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5"; depends=[extraDistr]; };
   trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; };
   trendsegmentR = derive2 { name="trendsegmentR"; version="1.0.0"; sha256="0zgm5nbm5azmz6x0xg4aphc80q6x1cvijry9pznyi0mg14743g86"; depends=[]; };
   trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; };
-  trialr = derive2 { name="trialr"; version="0.1.2"; sha256="1pwg6n11642a8zn7443a73w18yxrwqdniriaj7iq7ajnj31dbi70"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; };
+  trialr = derive2 { name="trialr"; version="0.1.3"; sha256="15330qsihq71x78pxv2k6pb1xfhp5qgdq0p4jibcjn1q114rp2ph"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; };
   triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; };
   triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
   tribe = derive2 { name="tribe"; version="0.1.8"; sha256="01z1b9k3j4xi5fp9pkpr991yr7x8vk8vysipy7iwdmdr7xg4w4p0"; depends=[dplyr lazyeval magrittr rlang rstudioapi]; };
@@ -14649,8 +14677,9 @@ in with self; {
   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.1"; sha256="0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn"; depends=[]; };
+  trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; };
   trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; };
-  trinROC = derive2 { name="trinROC"; version="0.3.1"; sha256="12kmpypbq3ldh8vn38w7agfq5bn98vp27qyvivvbqryc18y0isk3"; depends=[ggplot2 gridExtra rgl]; };
+  trinROC = derive2 { name="trinROC"; version="0.4"; sha256="02civ3r14hr6gbw6bdh77y00kiki6cdcv85hxk5g6n2nfspdr67r"; depends=[ggplot2 gridExtra rgl]; };
   trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
   trip = derive2 { name="trip"; version="1.6.0"; sha256="089wwdbf3mqz2gxskr9pwi124qbmjf6s9gq7vfrjyhcbp4xx8hwp"; depends=[geodist glue maptools MASS raster sp spatstat viridis]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
@@ -14669,14 +14698,14 @@ in with self; {
   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-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; };
-  trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
+  trust = derive2 { name="trust"; version="0.1-8"; sha256="1b6wsx4vybr5952ii3ska6jbcb3654iibz83n645khxfca5k8blm"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
   trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; };
   tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.6"; sha256="0ik2y2ac771z9r0wb4av2xhr3xv36n4wcv8cqx0vid3wcmbl6prc"; depends=[]; };
   tsBSS = derive2 { name="tsBSS"; version="0.5.5"; sha256="19i9raw3wiig66a84msqqwwxd9br4ayk108v7d9j78d0ynm6ki84"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; };
-  tsDyn = derive2 { name="tsDyn"; version="0.9-48.1"; sha256="0r8xxzr2z7r7xzpvi3sani169j3irw866gdmml0798czbdarq1qd"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
+  tsDyn = derive2 { name="tsDyn"; version="10-1.1"; sha256="1d79kjb63z63yddjmb2gs8ngjr3pdvrgla8pzdq9p06q041yvkhj"; 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]; };
+  tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; };
   tsbox = derive2 { name="tsbox"; version="0.2.0"; sha256="0kyw276qi20801ps3kd61k1s4vs0znsyzzy8mwjq312cbjisg6mc"; depends=[anytime data_table]; };
@@ -14686,7 +14715,6 @@ in with self; {
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdf = derive2 { name="tsdf"; version="1.1-7"; sha256="1c6fmvbpwvzy654c7hs56nxdp27wy9vyb521rdw33mgxvnyjbjqn"; depends=[]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
-  tsensembler = derive2 { name="tsensembler"; version="0.0.5"; sha256="0jld5yj9j7wwp0p1j89mh1w82s813yix82r6fd9zqcr40nx5qcq7"; depends=[Cubist doParallel earth foreach forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xgboost xts zoo]; };
   tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
@@ -14700,7 +14728,7 @@ in with self; {
   tsibbledata = derive2 { name="tsibbledata"; version="0.1.0"; sha256="17qvjfkppg1z4pxgax37ikx2x28ib39syps5vhppc1y3yn8441vq"; depends=[tsibble]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsmp = derive2 { name="tsmp"; version="0.3.5"; sha256="1gilzxxgaa1qqsk56s7ynlqhz6bssxrpc1h7fxkjp0z9amajvb5h"; depends=[audio doSNOW foreach magrittr progress]; };
-  tsna = derive2 { name="tsna"; version="0.3.0"; sha256="0d8s5v7slpkqi1lx9laxn7k7d7m00nga83wbc0a9ca3lwz9rkx99"; depends=[network networkDynamic statnet_common]; };
+  tsna = derive2 { name="tsna"; version="0.3.1"; sha256="15dx5inmlk05asakjv3jzlycid307xjpy4x2h52phix69ghbb95v"; depends=[network networkDynamic statnet_common]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
   tsoutliers = derive2 { name="tsoutliers"; version="0.6-8"; sha256="02qd7ky416yp2l4cfl2yl7ckr2aidkps9cxkk03r9r7c5247c6zh"; depends=[forecast]; };
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
@@ -14713,6 +14741,7 @@ in with self; {
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.2"; sha256="1lmvwk83186qb59k3i4ppv85dvz7fww8wr97mvkl8457mf4n6kg0"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.6"; sha256="1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4"; depends=[corpcor limma MASS matrixStats simsalapar sva]; };
   ttTensor = derive2 { name="ttTensor"; version="0.99.2"; sha256="1qhpsaa0m8g61mhdffnrpfsc66iwm240na2wsa3cnmydk1mqjlxd"; depends=[Matrix PTAk rTensor tensorr]; };
+  ttbary = derive2 { name="ttbary"; version="0.1-1"; sha256="028v4kgli3bdsa6cn9wz9g1c3n0r1cms70yhxgq829i8f9qw2mss"; depends=[Rcpp spatstat]; };
   ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; };
   ttdo = derive2 { name="ttdo"; version="0.0.4"; sha256="1hq1s2rsngx496mhrf9pnpvp25805f17pfj7l0dm5g7lmiq24rr8"; depends=[diffobj tinytest]; };
   ttestshiny = derive2 { name="ttestshiny"; version="0.1.0"; sha256="186569p9h3597z9lxyzm7fj8k6bzgm2kw757dcv2qhhf2k7nfch9"; depends=[dplyr shiny shinyAce shinyjs]; };
@@ -14731,7 +14760,7 @@ in with self; {
   tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; };
   tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; 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]; };
+  turboEM = derive2 { name="turboEM"; version="2020.1"; sha256="0z367lmq17al1swq4lrn8hs45xz0fxyls6i0r820f4caxmrii5pm"; 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]; };
@@ -14739,7 +14768,7 @@ in with self; {
   tvR = derive2 { name="tvR"; version="0.3.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   tvReg = derive2 { name="tvReg"; version="0.4.2"; sha256="1ma6jiqlj5jlsyk37vcddyv427xi8980cbplb40ppync18f7psmp"; depends=[bvarsv MASS Matrix systemfit vars]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
-  tvgeom = derive2 { name="tvgeom"; version="1.0.0"; sha256="18vqkxqikj87nhcayp7f5amh1mzfpnv2lfb9wg900wi5xpzg4n1q"; depends=[knitr testthat]; };
+  tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; };
   tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; };
   tvthemes = derive2 { name="tvthemes"; version="1.1.0"; sha256="0bc9li8vgmm4r6dshm52ll2d69gcynv1xrv8n7jhbyn7xmx3q3kz"; depends=[extrafont ggplot2 glue magick scales]; };
   twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; };
@@ -14759,14 +14788,15 @@ in with self; {
   txtq = derive2 { name="txtq"; version="0.2.0"; sha256="1w4dmws2l0r5bbx2n2g79dfrpa8dz4hlg8raphgh8mimf1skfb3h"; depends=[base64url filelock R6]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
   uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; };
-  uGMAR = derive2 { name="uGMAR"; version="3.2.0"; sha256="09x7wf5lgqrz5vpgbsl13c4p57amf3wp6yaib10zh1xnmw3fa2i6"; depends=[Brobdingnag pbapply]; };
+  uGMAR = derive2 { name="uGMAR"; version="3.2.2"; sha256="0p8n4wpqc7xqlsmr3gxspshfpfzh7zjrshqlnflszhrnngffgkif"; 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.4"; sha256="0djx6z9489pr03bf01y2d79ar840q4ffj39j72c8phz27yz40y04"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
-  ubiquity = derive2 { name="ubiquity"; version="1.0.0"; sha256="065jygsqsz2sczpri4xdw7gjjk1pp6z87nl3v5a6a6lsmkzkwlhz"; depends=[deSolve digest doParallel doRNG flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny]; };
+  uavRst = derive2 { name="uavRst"; version="0.5-4"; sha256="0dd83xbzssvmqy0g053lzlkjpa7cpqiijsyi06qsk2krq4wp94ml"; depends=[foreach raster Rcpp]; };
+  ubiquity = derive2 { name="ubiquity"; version="1.0.1"; sha256="1aachql6k1fldfliv8gkny91rxca5h60is4cj98mizipc9cal7jz"; depends=[deSolve digest doParallel flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny stringr]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
-  uchardet = derive2 { name="uchardet"; version="1.0.1"; sha256="1h6vkf3kbh7bzb1vp5rdss1r52lgvd4m3c73r89ba3kpsnwyzcvq"; depends=[Rcpp]; };
-  uclust = derive2 { name="uclust"; version="0.1.0"; sha256="0b4cj1np4b7m3nfk3crisw9qznk86lbh7x9xb70lwjmcjjgxkw8q"; depends=[dendextend robcor]; };
+  uchardet = derive2 { name="uchardet"; version="1.0.2"; sha256="1cyywm42ic2laal9clc0w6z2a8k4j21iz1vj903bxhxs940dv9n4"; depends=[Rcpp]; };
+  uclust = derive2 { name="uclust"; version="0.2.0"; sha256="1hvyrkah0yfia5wwr42q6axja56qwnils84pg25znq39fjly6hjf"; depends=[dendextend robcor]; };
   ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
   udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; };
   udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; };
@@ -14777,11 +14807,12 @@ in with self; {
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
   ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; };
+  uklr = derive2 { name="uklr"; version="1.0.0"; sha256="1c1r7d76rjh9ki2fwhv8chmhc2j5kzv3d9lv7qvr1cxyfsbxrsfb"; depends=[httr jsonlite tibble]; };
   ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; };
   ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; };
-  umap = derive2 { name="umap"; version="0.2.3.1"; sha256="0rzz1s029cn1w1bf5va2pav2lg9j1mq97ibwcln39drvm67kj76d"; depends=[openssl Rcpp reticulate RSpectra]; };
+  umap = derive2 { name="umap"; version="0.2.4.1"; sha256="1pnh3hv8ihiz2nszqp797lkrdhhna2a6mzpizbsk0s9m8cj4wxva"; depends=[openssl Rcpp reticulate RSpectra]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="3.0.0"; sha256="1d72b2i6qcflaqsabl7cy7ndqvw5r0chji15x925s4mm4cd92gvk"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
+  umx = derive2 { name="umx"; version="3.0.5"; sha256="1xyv9xfqa5q5bzrrnqc07xi3y0kdlw9c1dy6dciqdcmynwkvidh2"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan 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]; };
@@ -14789,7 +14820,7 @@ in with self; {
   understandBPMN = derive2 { name="understandBPMN"; version="1.1.1"; sha256="04wnyxplrn5c6jb76dw25pawwcvvn5xq80lqn5imsf31nbwybpm5"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr usethis XML]; };
   unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; };
   unglue = derive2 { name="unglue"; version="0.0.1"; sha256="0avk5d4dgbmqvmqlr5kbhg3qsyg5rxmw9icadivaahzf4znav5x4"; depends=[]; };
-  ungroup = derive2 { name="ungroup"; version="1.1.1"; sha256="0jrxxp93ak9bva98j3nmkhrb7znz7lpywk56415k4b2rzpy3j7fs"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; };
+  ungroup = derive2 { name="ungroup"; version="1.1.5"; sha256="0247mzicghdy2s41dsf1f2yx9j0j4qnahmh1bjaiwl4q1541k3l0"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; };
   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.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; };
@@ -14805,12 +14836,13 @@ in with self; {
   unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; };
   univOutl = derive2 { name="univOutl"; version="0.1-5"; sha256="193wrpkvgmlrx43nag8w3ivrlqm37nm6g86wcvd3bgw3hchs70gi"; depends=[Hmisc robustbase]; };
   unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; };
+  univariateML = derive2 { name="univariateML"; version="1.0.0"; sha256="1l8b9fll93nhspbhrap94sdgdmligb49qlzvlm0x4msqmh085ib4"; depends=[actuar assertthat extraDistr logitnorm nakagami tibble]; };
   unix = derive2 { name="unix"; version="1.5"; sha256="0sgm1gzfkfilrsgmv567ld79azmfk076xl998sv139kh9dvwgsyx"; depends=[]; };
   unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; };
-  unmarked = derive2 { name="unmarked"; version="0.13-0"; sha256="02i6iz4fqzb2frpscgq2kb7ywk2kpwsa3k9lx4c06p4x5zfhqfyj"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo reshape2]; };
+  unmarked = derive2 { name="unmarked"; version="0.13-1"; sha256="1qg71jgdg9psbca8ki933x8g7r48rbbybq2ys8nj8pyhz89hgbkr"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo reshape2]; };
   unpivotr = derive2 { name="unpivotr"; version="0.5.1"; sha256="0j2q98xm3gg3mscn9ckl4pcihwc4p5gn4sk5sr1nqi4ghc047qaf"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr tidyselect xml2]; };
   unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
-  unrtf = derive2 { name="unrtf"; version="1.3"; sha256="06v6hjpbybv07vqfq23i2s6j0ic035vnm0i4wfqgiw0pw6c85242"; depends=[sys]; };
+  unrtf = derive2 { name="unrtf"; version="1.4"; sha256="0ri68vfhc0acizjsk62v4l1g6l773y955yhcbqgks0vbrk01yfxg"; depends=[sys]; };
   unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
@@ -14820,7 +14852,7 @@ in with self; {
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
   uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
-  upwaver = derive2 { name="upwaver"; version="1.2.0"; sha256="0zz8l7nav59l1n5g7bnqzkw3sh9v857zm0ld68ycmdjy9d0q0yb8"; depends=[assertthat httr rjson XLConnect xlsx]; };
+  upwaver = derive2 { name="upwaver"; version="1.2.1"; sha256="02yx4ijww084cxsjbf68l5zv0pf1hsqwqq8rgbc6rm3qp00v18a5"; depends=[assertthat httr rjson XLConnect xlsx]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urbin = derive2 { name="urbin"; version="0.1-8"; sha256="0nbcs4rjqdqmyq046kx3nnvaxxzi0rxcxjma11lpn4ws1wdm6bng"; depends=[]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
@@ -14835,9 +14867,9 @@ in with self; {
   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.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; };
   usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
-  ushr = derive2 { name="ushr"; version="0.1.0"; sha256="1m25pi96hkv4v2933clgzyknp36mvn9hsay8k4phqar4xxarrm11"; depends=[dplyr ggplot2 tidyr]; };
+  ushr = derive2 { name="ushr"; version="0.2.0"; sha256="1jgkq87a90xg6dwrgv78flcprxw7na847ig8m4rkcnc084pyxv8w"; depends=[dplyr ggplot2 tidyr]; };
   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]; };
+  usl = derive2 { name="usl"; version="2.0.0"; sha256="1bdbscz4mbmrdnfvvgncjsshmry9hab2jz09gqc2hdzcxnfvmsp0"; depends=[nlsr]; };
   usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; };
@@ -14850,26 +14882,27 @@ in with self; {
   utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; };
   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]; };
-  uwot = derive2 { name="uwot"; version="0.1.4"; sha256="1y9wpzs92d1fl2x5figfywd48lkyhwx37j542z0rf6ckrl46n89n"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; };
+  uwot = derive2 { name="uwot"; version="0.1.5"; sha256="0pz9wa89xq4d119q86lskrznf979m0r1db8iaprcz7kxbi6b8lrj"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; };
   vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; };
   vagalumeR = derive2 { name="vagalumeR"; version="0.1.6"; sha256="0zakpg5p9kif61d35as08f2dac3wncyvhpc83rqjp96g99wjf701"; depends=[dplyr httr jsonlite magrittr purrr stringr]; };
-  vagam = derive2 { name="vagam"; version="1.0"; sha256="01bij09nzb6lg2rac2yjnbpywvllgk5dnm50a5k3qffp6fhywa80"; depends=[gamm4 Matrix mgcv mvtnorm truncnorm]; };
+  vagam = derive2 { name="vagam"; version="1.1"; sha256="1bgpf0z23yqyaz7dfmqilyqvr5v4w891027xrlr0mk9grj4srmiq"; depends=[gamm4 Matrix mgcv mvtnorm truncnorm]; };
   valaddin = derive2 { name="valaddin"; version="1.0.0"; sha256="0dws2mcjpyw0jn0h6badhlnxg88c6mgzvcp2fjjrpr5mpcgps1c8"; depends=[lazyeval]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
   valetr = derive2 { name="valetr"; version="0.1.0"; sha256="0lwdqx3wn8dn5cxypnmhwr8py461iyccgq437az0209akc72a7z4"; depends=[curl jsonlite]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.9.2"; sha256="1zy94dipyw7cgfq3cp7a5dmri7lw6h4m0nrzgf5gq49dsqpyvnlz"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.9.3"; sha256="0ckr4i75w503jxwghkmc7mi9b9z54gjipxl6limz4sry0py3lyl4"; 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.6"; sha256="19qn2azx3yhjmz286bbn37kgvilmhg13mpnxwqj1qaa3791jhq8r"; depends=[lpSolveAPI validate]; };
+  validatetools = derive2 { name="validatetools"; version="0.4.7"; sha256="0pqy76gpn0z20f6bpbnv0ryjb8p4x5j821a46ld19r9lvp7a9rrr"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
   valr = derive2 { name="valr"; version="0.5.0"; sha256="14jhrwkiwmha3vlmm7b50n2xxyizj6ddmy89gb20mpzq7qhz1ika"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
   valueEQ5D = derive2 { name="valueEQ5D"; version="0.5.0"; sha256="0835p71lipihxks8mzb4wisrjlnlqb794khzw0bh6f6j5s3kaspb"; depends=[rstudioapi testthat]; };
   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]; };
+  vamc = derive2 { name="vamc"; version="0.1.1"; sha256="0mpn7vp7kc19zbnviah18r972vpw2q5l884xvjkyn23gsib1scvg"; depends=[Rdpack]; };
+  vampyr = derive2 { name="vampyr"; version="1.0.5"; sha256="0hnxgl2cp3scnazr7fnjgzfz5ihfzs5gwbsb6jlq569d6il9jjl7"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych]; };
   vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; 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.4.0"; sha256="0vv8vd5gkhf7vjicm1r3c6liibgvdfnm030b1p7fm71jb7ycg49p"; depends=[Rcpp]; };
@@ -14877,6 +14910,7 @@ in with self; {
   varImp = derive2 { name="varImp"; version="0.3"; sha256="08kqnqv29bmw2lqnsyffnbwr3a0f97mf593pkwzak6wy0mkqrm5z"; 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]; };
+  varTestnlme = derive2 { name="varTestnlme"; version="0.1.0"; sha256="1ny42d2s5f7nlgw3b6awiimhc7ppil9hbizb09qhgsrrp3zsn497"; depends=[alabama anocva corpcor doParallel foreach lme4 Matrix matrixcalc merDeriv msm mvtnorm nlme quadprog saemix]; };
   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.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; };
@@ -14896,20 +14930,20 @@ in with self; {
   vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; };
   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]; };
+  vcd = derive2 { name="vcd"; version="1.4-5"; sha256="0pqf1sdp0d60aqc7721hy2zfcp57902by0i28jqbn683dd50c21a"; 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]; };
+  vcfR = derive2 { name="vcfR"; version="1.9.0"; sha256="0rz25ldy475m43mc5rmvy8yvgspf3pwb154h4jbk2nlk12473d0x"; 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.3.0"; sha256="0wbd6mf2v769rl0h1dw4fzznypaavfr1gw51sk100qiln46jvz05"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
+  vcr = derive2 { name="vcr"; version="0.4.0"; sha256="1fy48j5ky271x5a41xrba290nqbzhpqizbl8lg8sxhlr8l30pi62"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
-  vctrs = derive2 { name="vctrs"; version="0.2.0"; sha256="05h0y8qzwc899qj84gkhg4jwzscd065as00d4d8smv42h4i8zkjv"; depends=[backports digest ellipsis glue rlang zeallot]; };
+  vctrs = derive2 { name="vctrs"; version="0.2.1"; sha256="0rlwjfvvhv3s5mj4lqhwlqwddpizyp46i1qbcvw0mzb5q8b0nkz0"; depends=[backports digest ellipsis glue rlang zeallot]; };
   vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; };
   vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
   vdiffr = derive2 { name="vdiffr"; version="0.3.1"; sha256="1l0vzh7nnwr64cq0nixnr4m0iya4mdpqvh45g2wf1hja51mcvw0a"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; };
-  vdmR = derive2 { name="vdmR"; version="0.2.6"; sha256="15d3yrwiqs7cfyzl6v5vqgi33arx9lxjbqpif9zzfb56j0x1xsk5"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; };
   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=[]; };
+  vectools = derive2 { name="vectools"; version="0.1.1"; sha256="0aysld5pzs6z073zc3cli5xzv4w1kp6b06qi57gacz7g24pjrjl4"; 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-6"; sha256="0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; };
@@ -14918,11 +14952,12 @@ in with self; {
   vegdata = derive2 { name="vegdata"; version="0.9.7"; sha256="1cfb993p8sgm08g5859v4q9mil3a64yzhx3hzddvp536pq7jsc86"; depends=[foreign plyr xml2]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
   vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; };
-  vein = derive2 { name="vein"; version="0.8.0"; sha256="1yaz7vxcb6sspalsdzjjb0i08w0s2f0p3ms0gli1v8z4qfgg5izz"; depends=[data_table eixport sf sp units]; };
+  vegtable = derive2 { name="vegtable"; version="0.1.5"; sha256="04q1dl4p12r4a05nhrlpzy4f5jw6i49ydaq5xrd84x1n6cc5qar9"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
+  vein = derive2 { name="vein"; version="0.8.5"; sha256="17a81x2c9mv9df1l4znw5rmjlb17qaicprkirfpgr5n1m6mnlx6s"; depends=[data_table eixport sf sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; };
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
-  venn = derive2 { name="venn"; version="1.7"; sha256="0lll5bcwx64di4m0k56f00vsfaas2l2mkcbblniq302v0g12v8cj"; depends=[]; };
+  venn = derive2 { name="venn"; version="1.9"; sha256="0d2vwjc932q8n9hww8krj7nixg1dfkmcw1k1cry2d0xdvbbnrj8r"; depends=[admisc]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
   vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
@@ -14930,7 +14965,7 @@ 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.7"; sha256="1gwaa5wz675g6hgifwvskix929ar1jk2h0gpfyhxifzdb6dp2mw4"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.8"; sha256="069vq4ysywakbnpa0cx711a7w6bhc4k3hr7rnsx8y4ji552ysji1"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
   vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; };
   vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; };
@@ -14938,34 +14973,34 @@ in with self; {
   viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; };
   vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
-  viewshed3d = derive2 { name="viewshed3d"; version="2.0.0"; sha256="0wil1k64clfzjl2j5gl4xi4m4q0l15frxsphvsajp5hqgfpk6fn0"; depends=[data_table doParallel foreach iterators rgl tcltk2 viridis VoxR]; };
+  viewshed3d = derive2 { name="viewshed3d"; version="3.0.0"; sha256="0yx271xx4nfxjlvrg0c5x77n6zcahmj9kvz6qpzdg3ysg4ydyika"; depends=[data_table lidR nabor pracma raster rgl sp TreeLS viridis]; };
   vimp = derive2 { name="vimp"; version="1.1.6"; sha256="1jczlg8sa62f9skn32gbc094lbm41w5hp65w1k1imqxcvb43n8ql"; depends=[SuperLearner]; };
   vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; };
   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.3.4"; sha256="1fsklymilspzz5fzlj7666x09aglaw0v4x0yfjjzy4vr5qpjc529"; depends=[sm zoo]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  vip = derive2 { name="vip"; version="0.1.3"; sha256="140sv4rp7g600adh0mq8k8m8v6qdb6rkan87fh6i0svw67vbjr16"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; };
+  vip = derive2 { name="vip"; version="0.2.1"; sha256="1z3h4rjy15zvf0510ic1p1zxamhc4da74py6zy56c44y9yy1nvp5"; depends=[ggplot2 gridExtra magrittr 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=[]; };
   viromeBrowser = derive2 { name="viromeBrowser"; version="1.0.0"; sha256="0adyf6ssi0ph7x880inj1vfmpjfbsaavjavjnrpr9cb6p0qdmvyc"; depends=[Biostrings data_table DT ggplot2 markdown plyr rbokeh reshape Rsamtools shiny shinycssloaders shinydashboard shinyWidgets stringr]; };
   virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; };
-  virtualspecies = derive2 { name="virtualspecies"; version="1.5"; sha256="1n6qrh53a12n8ir4r16slb1qxxwm6h5kj96hpxalaqlbrr1sm3yz"; depends=[ade4 raster rworldmap sp]; };
-  virtuoso = derive2 { name="virtuoso"; version="0.1.3"; sha256="12rpqrhsj0n3f360w2gh1mwjjd6w9mv42116z86zaxvic8hf5694"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; };
+  virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; };
+  virtuoso = derive2 { name="virtuoso"; version="0.1.4"; sha256="1z222xl6h57fgnyk0n3d50j7y6hl9c4lb5g8n94f9krlgnbxi77q"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
-  visNetwork = derive2 { name="visNetwork"; version="2.0.8"; sha256="0l9h14k69vfpw64qggjcqy7vv86dvhjsy3aq2hrm2h6bpz503jl9"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visNetwork = derive2 { name="visNetwork"; version="2.0.9"; sha256="0854r9znpjd9iy6j5bgrn20vj13dhp606gs3b6iy0rhym71ks2sy"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; };
   visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; };
   visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; };
   visreg = derive2 { name="visreg"; version="2.6-0"; sha256="0an58wrgn8qxmigc3nvykvglh41asdz8bn4zrzpg34dxiqykqb4b"; depends=[lattice]; };
-  vistime = derive2 { name="vistime"; version="0.8.1"; sha256="0nm7sdbj99nlb46rfs5w2k62v1iikfymmz934rb21rn7cj8hs99p"; depends=[plotly RColorBrewer]; };
+  vistime = derive2 { name="vistime"; version="0.9.0"; sha256="1apyjapxqm05mlr4bx7s2x5v9ji8z8jb3spkrwcs0fibd6bq1dbb"; depends=[assertive plotly RColorBrewer]; };
   vistributions = derive2 { name="vistributions"; version="0.1.1"; sha256="1s68dpcy55v6yw7ivh2xpshz6qc0qaifjd15h7rjg3zl1cx81mh3"; depends=[ggplot2 magrittr shiny]; };
   visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
-  visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
+  visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; };
   visvow = derive2 { name="visvow"; version="0.8.0"; sha256="1h88sbsdwbf7cpy4y6glhqla9rhi8sbzi3lxxza7yaawhg567pp9"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
-  vitae = derive2 { name="vitae"; version="0.2.0"; sha256="0wxd4dlw8s5wi3x9nb6kn1yb3fjg1fbswx4dfg7pl6w19gx8ff4v"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; };
+  vitae = derive2 { name="vitae"; version="0.2.1"; sha256="053dy7c5zlrdb3hcbbdndx61ahkd2xwgl0i3ivcxwladyrkksyz3"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown xfun]; };
   vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
   vivo = derive2 { name="vivo"; version="0.1.1"; sha256="0qqzlf1hhalbblx6qsl1i9s4l7hybdpd5xpwjwcv4zgjizvzgbpx"; depends=[DALEX dplyr ggplot2 ingredients]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
@@ -14983,6 +15018,7 @@ in with self; {
   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]; };
+  vov = derive2 { name="vov"; version="0.1.0"; sha256="0ndcmkynd1b0l8672h5ziwvddijkxxrj5yvp95ry322rr253yckb"; depends=[glue htmltools shiny]; };
   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]; };
@@ -14990,14 +15026,14 @@ in with self; {
   vqtl = derive2 { name="vqtl"; version="2.0.5"; sha256="1sby1wi1lczs5cx97phq8dh15z68517rnw2zn5rzqa1399nmkkhf"; 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=[]; };
-  vroom = derive2 { name="vroom"; version="1.0.2"; sha256="07lmvi4a8x0kg112ffdppppvram5mhf9i9c9ag8grx3njabkw979"; depends=[crayon glue hms progress Rcpp rlang tibble tidyselect withr]; };
+  vroom = derive2 { name="vroom"; version="1.2.0"; sha256="1hpniwshmvx5mmv01sra4l6xaki8m2a2c98fg0p7gi06g2r0m6fs"; depends=[bit64 crayon glue hms lifecycle progress Rcpp rlang tibble tidyselect withr]; };
   vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   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]; };
-  vtable = derive2 { name="vtable"; version="0.5.0"; sha256="02dagwaakf08v9y2lm5j2r5bfz8sg6ac0hv6akmjp0llq2bd725d"; depends=[sjlabelled]; };
-  vtreat = derive2 { name="vtreat"; version="1.4.7"; sha256="1x2z1sc45jnbnj3p2nfb7v1r2f4lca86ky0znl5hlvk174d2nxyf"; depends=[wrapr]; };
-  vtree = derive2 { name="vtree"; version="3.0.0"; sha256="0la03f34pnrghsaszp97xl0bri71v23cqylsaqz077077aryj1m2"; depends=[DiagrammeR DiagrammeRsvg rsvg]; };
+  vtable = derive2 { name="vtable"; version="0.6.0"; sha256="13kj9fanrj1xk3n1fc55lv48l2hrysp9b4fmkws7l8qfai4y53gl"; depends=[rstudioapi sjlabelled]; };
+  vtreat = derive2 { name="vtreat"; version="1.5.1"; sha256="0d755r84cpw5fglj8afrazhqvswa6xkp4xwa1jdcmpiaw4f0mhdx"; depends=[digest wrapr]; };
+  vtree = derive2 { name="vtree"; version="4.0.0"; sha256="0i88ab7pjbj5s5xvykx47xxhqlk1vw3anra30wvhy6cr9774x8bg"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; };
   vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
@@ -15009,21 +15045,22 @@ in with self; {
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
   wTO = derive2 { name="wTO"; version="1.6.3"; sha256="1cgbw37b734ipg5qhjsil55qysfn6xmymj1q99ybkadi0axp55nn"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; };
   waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; };
+  wactor = derive2 { name="wactor"; version="0.0.1"; sha256="0dc7413jb3yz0nns2lc93w32wv6m4sg17j2ip63gc12vis0nf855"; depends=[ggplot2 Matrix R6 text2vec tibble tokenizers xgboost]; };
   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=[]; };
-  waiter = derive2 { name="waiter"; version="0.0.6"; sha256="1hxp525zk422cw88cnap5kc773qff9gc840jqa0k88hh34yhyybb"; depends=[magrittr R6 shiny]; };
+  waiter = derive2 { name="waiter"; version="0.1.0"; sha256="13csg6iy6fzr5fkz3wvmj1fvi0csijbgmvz262jnrq1c75srirmb"; depends=[magrittr R6 shiny]; };
   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.3.0"; sha256="0p45mq6xfpzr82y8pbfv04r85prvygm6z01xda4paicmimynd2r4"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
-  walkr = derive2 { name="walkr"; version="0.4.0"; sha256="1lra3ard90nzlpwwfiq50ghd3qv5xnmsp8rjhlq9rkpa7xazsnx8"; depends=[hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="1.0.6"; sha256="0pnkwdfmimnvyygbz1iz1b9fhcdi7k53wjw44kmnr2b7ln9pbcl2"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin XML zip]; };
   wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; 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.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.18"; sha256="10kwr7x4m210hmhjn15rxg72mm24imibswqasdx7pkxpfbavccq1"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.20"; sha256="0xk7n98h80larhh1mvs8d9ji17hvq699gcy22m5xaqqh8xi4y1h0"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; };
+  warp = derive2 { name="warp"; version="0.1.0"; sha256="16bmym91h0sbbh4iqasqs0f4kp3jqlm3sqgc356mznhxwnsm8dm2"; depends=[]; };
   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]; };
@@ -15050,7 +15087,6 @@ in with self; {
   wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; };
   wdman = derive2 { name="wdman"; version="0.2.4"; sha256="00q9qk8qgz7fjbd9j8pxknrw8lk1ardifg8w4agyrk8r4q56b1a0"; depends=[assertthat binman semver subprocess yaml]; };
   wdpar = derive2 { name="wdpar"; version="1.0.0"; sha256="1039pf3hz5nym2y00wqwj027dc8m5ny2a1pqavbybn6cxbq0m2r1"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; };
-  weathercan = derive2 { name="weathercan"; version="0.3.1"; sha256="1xvbqb6w9w9ynbxgpjr56sq43c7p8hncqy2pdl5hxgc32d51wlkc"; depends=[dplyr httr lubridate purrr rlang rvest 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.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; };
@@ -15059,7 +15095,7 @@ in with self; {
   webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.4.0"; sha256="07bw1clrhl7769xlgkqn4k3dn2lqbj1g9nmz7pl6iyvw0rmllrgb"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.5.0"; sha256="0x4hrhmxqm4291babkkdpv25f36kvz879q3ff2j4n6hk4maqvkki"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; 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]; };
@@ -15075,12 +15111,11 @@ in with self; {
   weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; };
   weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; };
   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="2.0.2"; sha256="1qsyak91kdgv48wf6qhpfbiirlg4ba9w6rw8ynjcsnqqdvmly1lb"; depends=[ggplot2 scales]; };
   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.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; };
-  wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; };
+  wellknown = derive2 { name="wellknown"; version="0.6.0"; sha256="156kffa421d6k9wnab4pr22h4c9gnkw3i2fbk5jg03jl2rff090w"; depends=[jsonlite V8]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; };
   wevid = derive2 { name="wevid"; version="0.6.2"; sha256="1ranmqhgfkrky7r4qk563n9nlz2syn3vj85lmfajq01csadzjdpl"; depends=[ggplot2 mclust pROC reshape2 zoo]; };
   wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; };
@@ -15091,7 +15126,6 @@ in with self; {
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
-  whiboclustering = derive2 { name="whiboclustering"; version="0.1.2"; sha256="0bzzr71kbynzj28i8g5li5j40653nyh08ywgs2xww49qxjm3b9lj"; depends=[cluster clusterCrit]; };
   whisker = derive2 { name="whisker"; version="0.4"; sha256="1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks"; depends=[]; };
   whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; };
   whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; };
@@ -15099,7 +15133,7 @@ in with self; {
   whoami = derive2 { name="whoami"; version="1.3.0"; sha256="19fwl7z55s4kl2xzwqwh8iwg13kdrv222vyl3kibxgwrjcjwj2y2"; 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]; };
+  widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; };
   widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; };
   widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wiesbaden = derive2 { name="wiesbaden"; version="1.2.0"; sha256="09nf25s134livlcgfl0aq5njg50kcw82nmiin6jqzwpjkd35x6vp"; depends=[httr jsonlite keyring readr stringi stringr xml2]; };
@@ -15116,13 +15150,13 @@ in with self; {
   winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; };
   windAC = derive2 { name="windAC"; version="1.2.0"; sha256="1dwnj0spxq9n73vg938j5jn0vvzvlqnfb4j0slzxp6lvkkyd2sc4"; depends=[mvtnorm sf]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="2.2.2"; sha256="0gj62b0ppk478xz5f5cwqkb4rhs7fabpx8zl6p0zm1z6dzclq1rc"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
-  wiqid = derive2 { name="wiqid"; version="0.2.2"; sha256="0rfv8vnz585p970slm9rw1ikp9ryv8qixvbq4lq3prawhk3x1vhp"; depends=[coda HDInterval MASS truncnorm]; };
+  wiqid = derive2 { name="wiqid"; version="0.2.3"; sha256="166d9cdrj8vz2m5n1yxhckhs9nmd3sv13c3jcifzjixl45f8f2aa"; depends=[coda HDInterval MASS truncnorm]; };
   wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; };
   withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; };
-  wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
+  wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; };
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
   wmm = derive2 { name="wmm"; version="1.0.0"; sha256="0f46a69vcz1cb4qmz68gf8h0hq5amilsp9h4gmacmprad49n702g"; depends=[]; };
@@ -15141,8 +15175,9 @@ in with self; {
   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-5"; sha256="1xrnzq5hmdwdd7692as4ddjkr64bfgl141xx2gvcla308rxql9yp"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
-  workflowr = derive2 { name="workflowr"; version="1.5.0"; sha256="0jvdm6kgny84rxmriqq2hrabgdx9v3m5wmypsc5nbwyka94578gl"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
+  wordspace = derive2 { name="wordspace"; version="0.2-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
+  workflowr = derive2 { name="workflowr"; version="1.6.0"; sha256="0q1rmaqf6v7zv8jfj7mzmdl4s87841lb3x0q34al9sgz8shwp36p"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
+  workflows = derive2 { name="workflows"; version="0.1.0"; sha256="1vmjlfyjavvz0677832cvn296xwk5rkv0jr4cncganadh2yjqa1d"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; };
   worldmet = derive2 { name="worldmet"; version="0.8.7"; sha256="1hhh3a28xxi5265053gclsbihv41372f64isz9xc5sjdjnpcv6g4"; 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.4.0"; sha256="0nb02k0aimf6z1fw4y5qzja4xwgwff7gdzh364w2lrhj8imcb044"; depends=[crul data_table jsonlite tibble]; };
@@ -15153,12 +15188,13 @@ in with self; {
   wpp2015 = derive2 { name="wpp2015"; version="1.1-2"; sha256="07bnbmrshlqnlpca5djpq5crnpsmz228wmbpv1ah7ywnjvks6fyx"; depends=[plyr]; };
   wpp2017 = derive2 { name="wpp2017"; version="1.2-1"; sha256="1hg3fj92ja93kw226crfxjvnjb7p0svdbi6pr3sqkg9w5zpwfwp1"; depends=[]; };
   wpp2019 = derive2 { name="wpp2019"; version="1.1-0"; sha256="0gx8rgz9lg6crn6ss76sg4xj8dsiwj08fkq5f67slvx4c0cjfhc5"; depends=[]; };
-  wppExplorer = derive2 { name="wppExplorer"; version="2.3-2"; sha256="05cvdwfmflciq42zr6v0279fhmsmsgdmqva2zvka95sch09kxci6"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; };
+  wppExplorer = derive2 { name="wppExplorer"; version="2.3-3"; sha256="0sz31xsdlk9p52sl5dik7g0qmkrjb7ydkknd154c988kqb5gbp0w"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; };
   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]; };
-  wrMisc = derive2 { name="wrMisc"; version="1.0.4"; sha256="042by7n3xr0ggwna3jlaq56sp8027q0iivs88mqc6mr6pngrs53f"; depends=[MASS]; };
+  wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; depends=[MASS]; };
+  wrProteo = derive2 { name="wrProteo"; version="1.0.0"; sha256="110rpwac6hccv8i55fdw3mzd500jip1ldzmqw4196igq61cd9m20"; depends=[limma wrMisc]; };
   wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.9.3"; sha256="1spkjpbx9plyiyr9ndni63cxxb3nxwzwszj2brdz5wj18qhvn86i"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.9.5"; sha256="0sjahmmvcxrpn2ajffzxb4q05ibzjwpiqsrijs8wvanb55zlpf4r"; 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.2"; sha256="09fhdip6igcg97fjx4c7727cx2lb49l4d74l4i8rg2bag2s5lrj3"; depends=[]; };
@@ -15167,14 +15203,14 @@ in with self; {
   wru = derive2 { name="wru"; version="0.1-9"; sha256="0xrm3f1khggcvdzzk65mnbfcyji3kjz8hrk9d2n4y15nhpbw8p8h"; depends=[devtools]; };
   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]; };
-  wsyn = derive2 { name="wsyn"; version="1.0.1"; sha256="1lsaah5dndg1myx3qgbm4hih2wr1zgjfaracnyljfrri2cb436n6"; depends=[fields MASS]; };
+  wsyn = derive2 { name="wsyn"; version="1.0.2"; sha256="0jl0wnw11yrbiygcpcnl1yi8xf5dd3sbh0c2yic8dc0p64k6iass"; depends=[fields MASS]; };
   wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
-  wv = derive2 { name="wv"; version="0.1.0"; sha256="13avx4dydy91aak9bjcqjj2hsbk9f0l4imqmwpg1fdmg6zx7694z"; depends=[coda Rcpp RcppArmadillo simts]; };
+  wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; };
   wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; };
   wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; };
   wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.4"; sha256="0npk9axsg6x8pgf3f19y2544jlrzf88269604cfdynp724l2dwb9"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; };
-  wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.14"; sha256="0zh3sqgwrv172dlmiiw5z86pyf1m32xkylixpdlillq731ag79v9"; depends=[crayon data_table lubridate R6 stringr tidyr]; };
+  wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.16"; sha256="1hsm6mb6cz58f0xgl8330gd40kbqplg3d4r133ncg0r43qb528xj"; depends=[crayon data_table lubridate R6 stringr tidyr]; };
   wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.7"; sha256="0rravk8hl2pbr3blsx96xas2zi7c9d83mpzhrqqqna66hg88zq5q"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; };
   wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.9"; sha256="0i4jmww0sg5w8ffvk4302jdi3m5bfrbywbx5756r4dijfhv9n2kq"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; };
   x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; };
@@ -15187,22 +15223,21 @@ in with self; {
   xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; };
   xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
-  xaringan = derive2 { name="xaringan"; version="0.13"; sha256="1xbrjqa676m7bv6vbr4ydf7c8v6bgpcqiqzjy90vz78rg8c1hcc2"; depends=[htmltools knitr rmarkdown servr xfun]; };
+  xaringan = derive2 { name="xaringan"; version="0.14"; sha256="16c20bkhizw65nnp2lyc6kjd461abj794qh4d00y8fglyj6wjjky"; depends=[htmltools knitr rmarkdown servr xfun]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; };
   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.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; };
-  xfun = derive2 { name="xfun"; version="0.11"; sha256="0dncw6bqkal7nyarrrrj9arxy0y3nkdzmrbibcjh84m1cxd4phiw"; depends=[]; };
+  xfun = derive2 { name="xfun"; version="0.12"; sha256="0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df"; depends=[]; };
   xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; };
   xgboost = derive2 { name="xgboost"; version="0.90.0.2"; sha256="1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
-  xgxr = derive2 { name="xgxr"; version="1.0.5"; sha256="0q97lavhlq66cfkcq1p3jqrknd5dxgsfrsiccgzk84bd8ab42i8h"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; };
+  xgxr = derive2 { name="xgxr"; version="1.0.7"; sha256="1hl2xblq06mgy0a1apfvdinyr8sqqmvqqi42xmcyl9di5x9kb0qx"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
   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]; };
   xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; };
-  xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; };
   xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; };
   xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
@@ -15213,13 +15248,14 @@ in with self; {
   xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; 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]; };
+  xnet = derive2 { name="xnet"; version="0.1.10"; sha256="1jjnj35j8wwnlc1w31m3l95kmgxm58rfbfkidrjhq6l96npprgn4"; depends=[]; };
   xoi = derive2 { name="xoi"; version="0.68-3"; sha256="0swi9zilghkfm17b39sdn7im4pcxcw7fk77jqxwib29q7x6574bk"; 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]; };
   xplorerr = derive2 { name="xplorerr"; version="0.1.1"; sha256="17h8z9rmqkmm6lm9gipa33mr7zxpzd5xbjk251592mwr79lwsh8n"; depends=[magrittr shiny]; };
-  xpose = derive2 { name="xpose"; version="0.4.5"; sha256="08z0n78ah27waj16rlzkvpgr9dy8z93j1lc9pfd3yip2nb9yxx45"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
+  xpose = derive2 { name="xpose"; version="0.4.6"; sha256="0y3fcy2g8qnb5nzfwimrx87c2h3k26im9h64fmv834zba7chkc47"; 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.1"; sha256="1xjmplalf5w7iqkc5dk57g7lvx4jlndg4b2hvqpn05g628bxxdx2"; depends=[]; };
+  xptr = derive2 { name="xptr"; version="1.1.2"; sha256="19zmzawp4mprwbcq2ajwwmmnf8vgnrkn86m246gz5f7rxzqz0vk3"; depends=[]; };
   xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; };
   xrf = derive2 { name="xrf"; version="0.1.2"; sha256="0mcyjw75f2w3hvx1r6lhc4yidmih2z6dfmkxvywm499whk2pcqhv"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; };
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
@@ -15230,7 +15266,7 @@ in with self; {
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   xtensor = derive2 { name="xtensor"; version="0.11.1-0"; sha256="1l9216z46m45vnc69j4qx336ln82qgpagi5m9qa5pabvcpz9b23p"; depends=[Rcpp]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
-  xts = derive2 { name="xts"; version="0.11-2"; sha256="1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj"; depends=[zoo]; };
+  xts = derive2 { name="xts"; version="0.12-0"; sha256="0q4cc8ynp7ndmgll1jj3lxyl6wmgg89ad3wq09kjc2ngszdfc4fz"; depends=[zoo]; };
   xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; };
   xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; };
   xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; };
@@ -15238,8 +15274,11 @@ in with self; {
   xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-31"; sha256="0088i9rlpkxb42xp11cr0h2ql9k581qvnz4ppldrnqci8c1qdpff"; depends=[]; };
   yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; };
+  yager = derive2 { name="yager"; version="0.1.0"; sha256="01gxpaf4wvii056xn84m9gkq46m7hxqgg5f2frakhgnlpm3afgfb"; depends=[lhs MLmetrics randtoolbox]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
   yaml = derive2 { name="yaml"; version="2.2.0"; sha256="0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m"; depends=[]; };
+  yamlet = derive2 { name="yamlet"; version="0.3.1"; sha256="0mrdvvbjpi65jdpzfm37h6v55dqsvmk7l5zxvkwazlcjp2w8wyg0"; depends=[csv encode ggplot2 knitr yaml]; };
+  yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; };
   yardstick = derive2 { name="yardstick"; version="0.0.4"; sha256="03pq8wmb6467mkp7ax1gpydg5c6q82r1byhdzjl92g7986p7h3mv"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; };
   yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
@@ -15252,15 +15291,15 @@ in with self; {
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; };
   ymlthis = derive2 { name="ymlthis"; version="0.1.1"; sha256="04vf722n0yk50bclv25m11rfvqjja5kjzkn9bbdf8pw3kw83brqa"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; };
-  yonder = derive2 { name="yonder"; version="0.1.2"; sha256="0xw78nmixhp8rb6vd7pgsjqgxdrig8f652hzpiirmqcc87f80ksk"; depends=[htmltools magrittr shiny]; };
+  yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
-  youtubecaption = derive2 { name="youtubecaption"; version="0.1.2"; sha256="183zbkzczcidd773ivahfjlsxfayczql10s8qxi3cpdr83f5dv6x"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; };
-  ypr = derive2 { name="ypr"; version="0.3.1"; sha256="0yir9c34i5yncijf6yiliv38glzbfmlr5781nvsnckh8wdb9flgx"; depends=[checkr ggplot2 scales]; };
+  youtubecaption = derive2 { name="youtubecaption"; version="0.1.3"; sha256="03xndrs28qlbr9bywbxxx110gsp0n36wqvf98ys7ypmlj6vki4ya"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; };
+  ypr = derive2 { name="ypr"; version="0.4.0"; sha256="15cjfghpamyfa9zkjrpvxbh487acg8yd21dn6z3r73nc9zmlnb2a"; depends=[chk ggplot2 lifecycle purrr scales yesno]; };
   yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
   yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yum = derive2 { name="yum"; version="0.0.1"; sha256="1q8yxn18nia7jh6g2016hxm81d2jak8pwylr6nai9kfynv9wri0g"; depends=[yaml]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
-  zCompositions = derive2 { name="zCompositions"; version="1.3.3"; sha256="14f4gnvwcw7mcs08dfnrjmrdifvv0h15zaz9ajxkzsazd619mkpj"; depends=[MASS NADA truncnorm]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.3.3-1"; sha256="0cad8dwl9by3f696rxqp2liqy00nczx9z21s1vbn2hq6xngd3i5p"; depends=[MASS NADA truncnorm]; };
   zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; };
   zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; };
   zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; };
@@ -15277,15 +15316,14 @@ in with self; {
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="2.0.4"; sha256="1c02amk3pl6xir5jnbfiwiv2wvpkpbkkb1w71y6lf2yk7g3d0pdb"; depends=[]; };
   zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; };
-  zipangu = derive2 { name="zipangu"; version="0.1.0"; sha256="1scl047mj7vpkrpgg2glvrr958p5nrwwcpymbkh4mqbhb90s79bg"; depends=[dplyr lifecycle magrittr purrr rlang stringr]; };
-  zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
+  zipangu = derive2 { name="zipangu"; version="0.2.0"; sha256="104crb890jbbkhi06rgy5gnrm99cad12rhc38k3h547ws2yr2639"; depends=[dplyr lifecycle lubridate magrittr purrr rlang stringi stringr tibble]; };
   zipfR = derive2 { name="zipfR"; version="0.6-66"; sha256="0fjqa9a4z2p21ywy8h3pg0gwq4gwzjnrl78kn1nswly3w637574h"; depends=[]; };
   zipfextR = derive2 { name="zipfextR"; version="1.0.1"; sha256="14p17xxnpnvvinbgjkfxjcmipfanj6vabfh8bzw78k30rl7bj32b"; depends=[copula tolerance VGAM]; };
   ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.5.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; };
   zoltr = derive2 { name="zoltr"; version="0.2.2"; sha256="0nxg37h6vlj5g6rxmgzy060h3lwfgjxvcf5gfpsgpg1mjg9h4k3f"; depends=[base64url httr jsonlite mockery readr webmockr]; };
-  zoo = derive2 { name="zoo"; version="1.8-6"; sha256="1k1pmzr9nfwbxq1xf0jzn3nawv4sgnkxkgzxnm1i887jcbrs85r2"; depends=[lattice]; };
+  zoo = derive2 { name="zoo"; version="1.8-7"; sha256="1w4542zs53bm261g95086a60576v334g1jrhnbgdqni4izf2s1wy"; 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.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5fa0cd15962d..df44139024a5 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -264,7 +264,6 @@ let
     gmp = [ pkgs.gmp.dev ];
     graphscan = [ pkgs.gsl_1 ];
     gsl = [ pkgs.gsl_1 ];
-    h5 = [ pkgs.hdf5-cpp pkgs.which ];
     haven = [ pkgs.libiconv pkgs.zlib.dev ];
     h5vc = [ pkgs.zlib.dev ];
     HiCseg = [ pkgs.gsl_1 ];
@@ -293,7 +292,6 @@ let
     phytools = [ pkgs.which ];
     PKI = [ pkgs.openssl.dev ];
     png = [ pkgs.libpng.dev ];
-    PopGenome = [ pkgs.zlib.dev ];
     proj4 = [ pkgs.proj ];
     protolite = [ pkgs.protobuf ];
     qtbase = [ pkgs.qt4 ];
@@ -317,7 +315,6 @@ let
     Rhdf5lib = [ pkgs.zlib ];
     Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf ];
-    RJaCGH = [ pkgs.zlib.dev ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
@@ -367,7 +364,6 @@ let
     udunits2 = [ pkgs.udunits pkgs.expat ];
     units = [ pkgs.udunits ];
     V8 = [ pkgs.v8_3_14 ];
-    VBLPCM = [ pkgs.gsl_1 ];
     WhopGenome = [ pkgs.zlib.dev ];
     XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
     xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
@@ -392,7 +388,6 @@ let
     # sort -t '=' -k 2
     svKomodo = [ pkgs.which ];
     nat = [ pkgs.which ];
-    nat_nblast = [ pkgs.which ];
     nat_templatebrains = [ pkgs.which ];
     pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     RMark = [ pkgs.which ];
@@ -413,7 +408,6 @@ let
     fftw = [ pkgs.pkgconfig ];
     geoCount = [ pkgs.pkgconfig ];
     gdtools = [ pkgs.pkgconfig ];
-    JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     jqr = [ pkgs.jq.lib ];
     kza = [ pkgs.pkgconfig ];
     magick = [ pkgs.pkgconfig ];
@@ -435,8 +429,6 @@ let
     rPython = [ pkgs.which ];
     gridGraphics = [ pkgs.which ];
     adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ];
-    PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ];
-    dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ];
     mzR = [ pkgs.netcdf ];
     cluster = [ pkgs.libiconv ];
     KernSmooth = [ pkgs.libiconv ];
@@ -524,7 +516,6 @@ let
     "fscaret"
     "fSRM"
     "gcmr"
-    "GeoGenetix"
     "geomorph"
     "geoR"
     "geoRglm"
@@ -571,7 +562,6 @@ let
     "mritc"
     "multgee"
     "multibiplotGUI"
-    "nodiv"
     "OligoSpecificitySystem"
     "onemap"
     "OpenRepGrid"
@@ -644,7 +634,6 @@ let
     "rsgcc"
     "RSurvey"
     "RunuranGUI"
-    "sharpshootR"
     "simba"
     "Simile"
     "SimpleTable"
@@ -668,7 +657,6 @@ let
     "SYNCSA"
     "SyNet"
     "tcltk2"
-    "TED"
     "TestScorer"
     "TIMP"
     "titan"
@@ -768,17 +756,6 @@ let
       '';
     });
 
-    JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
-      postPatch = lib.optionalString stdenv.isDarwin ''
-        for file in {R,src}/*.R; do
-            sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
-        done
-      '';
-      preConfigure = ''
-        patchShebangs configure
-      '';
-    });
-
     jqr = old.jqr.overrideDerivation (attrs: {
       preConfigure = ''
         patchShebangs configure

From b9e3d5ab9d29eed492f565c9b2ebd30429b436b7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 24 Jan 2020 13:13:52 +1000
Subject: [PATCH 555/755] runc: 1.0.0-rc9 -> 1.0.0-rc10

https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc10
---
 pkgs/applications/virtualization/runc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 48bd81f383a8..e7713d45f2fb 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 buildGoPackage rec {
   pname = "runc";
-  version = "1.0.0-rc9";
+  version = "1.0.0-rc10";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7";
+    sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
   };
 
   goPackagePath = "github.com/opencontainers/runc";

From e1e7da465b45c3de1c3cf7011825476bc1eef0dc Mon Sep 17 00:00:00 2001
From: tbenst <lensman@tylerbenster.com>
Date: Fri, 17 Jan 2020 18:47:21 -0800
Subject: [PATCH 556/755] vscode-extensions.ms-python.python: 2019.10.44104
 update language server to 0.4.127

---
 pkgs/misc/vscode-extensions/python/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 553dbc306455..376f52ec5ffc 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -23,14 +23,14 @@ let
     else throw "Only x86_64 Linux and Darwin are supported.";
 
   languageServerSha256 = {
-    linux-x64 = "159xfhpvqw6k8s5bk5jw3aydn6v61fbanq2mvddxcrf5hwf8cj8h";
-    osx-x64 = "0xjh1h77axbbyxikqkhq885n97srm0f15s4976pm1rka03zvd0bg";
+    linux-x64 = "10qwi8lih5i6216d1vqsmviab73ha0d3zdvircrgrydkf0d4ancd";
+    osx-x64 = "08gjxs0bjhz5a9l35vvgwnvzshsyyqiqvb5hxv6w0k2ajgv5z7av";
   }.${arch};
 
   # version is languageServerVersion in the package.json
   languageServer = extractNuGet rec {
     name = "Python-Language-Server";
-    version = "0.4.71";
+    version = "0.4.127";
 
     src = fetchurl {
       url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";

From 554d3a239aed1110e7650fbeb2e1b13c01349a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 24 Jan 2020 04:42:59 +0100
Subject: [PATCH 557/755] webkitgtk: 2.26.2 -> 2.26.3 (#78303)

https://webkitgtk.org/2020/01/22/webkitgtk2.26.3-released.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index d1e171566eea..8d1129c11685 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -61,13 +61,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.26.2";
+  version = "2.26.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b";
+    sha256 = "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd";
   };
 
   patches = optionals stdenv.isLinux [

From 05626cc86b8a8bbadae7753d2e33661400ff67de Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Mon, 20 Jan 2020 21:07:30 +0100
Subject: [PATCH 558/755] teleprompter: init at 2.3.4

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

diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix
new file mode 100644
index 000000000000..7cca3afa764d
--- /dev/null
+++ b/pkgs/applications/misc/teleprompter/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchurl, electron, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:
+
+stdenv.mkDerivation rec {
+  pname = "teleprompter";
+  version = "2.3.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/teleprompter-imaginary-films/imaginary-${pname}-${version}-64bit.tar.gz";
+    sha256 = "084ml2l3qg46bsazaapyxdx4zavvxp0j4ycsdpdwk3f94g9xb120";
+  };
+
+  dontBuild = true;
+  dontStrip = true;
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
+  installPhase = ''
+    mkdir -p $out/bin $out/opt/teleprompter $out/share/applications
+    asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  postFixup = ''
+    makeWrapper ${electron}/bin/electron $out/bin/teleprompter \
+      --add-flags "$out/opt/teleprompter/resources/app.asar.unpacked --without-update"
+  '';
+
+  desktopItem = makeDesktopItem {
+     name = "teleprompter";
+     exec = "teleprompter";
+     type = "Application";
+     desktopName = "Teleprompter";
+  };
+
+  meta = with lib; {
+    description = "The most complete, free, teleprompter app on the web";
+    license = [ licenses.gpl3 ];
+    homepage = "https://github.com/ImaginarySense/Teleprompter-Core";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1268532fae2..d299c1eb9b90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21674,6 +21674,8 @@ in
 
   telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
 
+  teleprompter = callPackage ../applications/misc/teleprompter {};
+
   tendermint = callPackage ../tools/networking/tendermint {
     buildGoModule = buildGo112Module;
   };

From d44322f1f3844fbff5833ad07c7c21aae26bd067 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Wed, 22 Jan 2020 03:53:30 -0500
Subject: [PATCH 559/755] maintainers: add arnoldfarkas

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1f0ead51af15..eff670a5affe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -594,6 +594,12 @@
     githubId = 1296771;
     name = "Anders Riutta";
   };
+  arnoldfarkas = {
+    email = "arnold.farkas@gmail.com";
+    github = "arnoldfarkas";
+    githubId = 59696216;
+    name = "Arnold Farkas";
+  };
   arobyn = {
     email = "shados@shados.net";
     github = "shados";

From 268180742c11c1dbed7e3bfabcfc619ce01255da Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Thu, 23 Jan 2020 21:52:21 -0500
Subject: [PATCH 560/755] pythonPackages.azure-storage-file-share: init at
 12.0.0

---
 .../azure-storage-file-share/default.nix      | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-storage-file-share/default.nix

diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
new file mode 100644
index 000000000000..78950d2971e8
--- /dev/null
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -0,0 +1,45 @@
+{ buildPythonPackage
+, fetchPypi
+, isPy3k
+, lib
+
+# pythonPackages
+, azure-core
+, cryptography
+, msrest
+, futures
+}:
+
+buildPythonPackage rec {
+  pname = "azure-storage-file-share";
+  version = "12.0.0";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg";
+  };
+
+  propagatedBuildInputs = [
+    azure-core
+    cryptography
+    msrest
+  ];
+
+  # requires checkout from monorepo
+  doCheck = false;
+  pythonImportsCheck = [
+    "azure.core"
+    "azure.storage"
+  ];
+
+  meta = with lib; {
+    description = "Microsoft Azure File Share Storage Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      kamadorueda
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f854138ba16..e1bd47648f04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -312,6 +312,8 @@ in {
 
   azure-storage-file = callPackage ../development/python-modules/azure-storage-file { };
 
+  azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { };
+
   azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { };
 
   azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { };

From dac34b3803af7736c6cc26b7ba2b84a7e0337fc5 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Thu, 23 Jan 2020 22:07:51 -0500
Subject: [PATCH 561/755] pythonPackages.pyhcl: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
new file mode 100644
index 000000000000..e409282980d6
--- /dev/null
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -0,0 +1,46 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, lib
+
+# pythonPackages
+, coverage
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pyhcl";
+  version = "0.4.0";
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "virtuald";
+    repo = pname;
+    rev = version;
+    sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs";
+  };
+
+  # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64
+  configurePhase = ''
+    echo '__version__ = "${version}"' > ./src/hcl/version.py
+  '';
+
+  checkInputs = [
+    coverage
+    pytest
+  ];
+
+  # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4
+  checkPhase = ''
+    coverage run --source hcl -m pytest tests
+  '';
+
+  meta = with lib; {
+    description = "HCL is a configuration language. pyhcl is a python parser for it";
+    homepage = "https://github.com/virtuald/pyhcl";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [
+      kamadorueda
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1bd47648f04..c0f46503d692 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2256,6 +2256,8 @@ in {
 
   python-ly = callPackage ../development/python-modules/python-ly {};
 
+  pyhcl = callPackage ../development/python-modules/pyhcl { };
+
   pyhepmc = callPackage ../development/python-modules/pyhepmc { };
 
   pytest = if isPy3k then self.pytest_5 else self.pytest_4;

From 52487f4e431d836eb3ecb87af24915967062d862 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Thu, 23 Jan 2020 22:09:41 -0500
Subject: [PATCH 562/755] pythonPackages.fluidasserts: 20.1.28253 -> 20.1.33141

---
 .../python-modules/fluidasserts/default.nix   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix
index f76692c50d97..78405ed8a660 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/pkgs/development/python-modules/fluidasserts/default.nix
@@ -12,9 +12,12 @@
 , azure-mgmt-compute
 , azure-mgmt-keyvault
 , azure-mgmt-network
+, azure-mgmt-resource
+, azure-mgmt-security
 , azure-mgmt-storage
 , azure-mgmt-web
 , azure-storage-file
+, azure-storage-file-share
 , bandit
 , bcrypt
 , beautifulsoup4
@@ -39,6 +42,7 @@
 , psycopg2
 , pycrypto
 , pygments
+, pyhcl
 , pyjks
 , pynacl
 , pyopenssl
@@ -57,30 +61,30 @@
 
 buildPythonPackage rec {
   pname = "fluidasserts";
-  version = "20.1.28253";
+  version = "20.1.33141";
   disabled = !isPy37;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1d2smx9ywd1azsiwgavp69vlixmvwaabshprm192wnmprbghsp6c";
+    sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx";
   };
 
   patchPhase = ''
     # Version mismatches between current FluidAsserts and Nixpkgs
     substituteInPlace ./setup.py \
-      --replace 'tlslite-ng==0.8.0-alpha29' 'tlslite-ng==0.7.5' \
-      --replace 'boto3==1.10.17' 'boto3==1.10.1' \
+      --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \
+      --replace 'boto3==1.11.7' 'boto3==1.10.1' \
       --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \
-      --replace 'azure-mgmt-storage==7.1.0' 'azure-mgmt-storage==7.0.0' \
+      --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \
+      --replace 'pillow==7.0.0' 'pillow==6.2.1' \
 
     # Functionality that will be not present for the momment
     #   but that we'll work to add in the future
     # Just a minimal portion of fluidasserts use this
     substituteInPlace ./setup.py \
-      --replace "'azure-storage-file-share==12.0.0'," "" \
       --replace "'pymssql==2.1.4'," "" \
-      --replace "'pytesseract==0.3.0'," "" \
+      --replace "'pytesseract==0.3.1'," "" \
       --replace "'pywinrm==0.4.1'," "" \
       --replace "'mitmproxy==5.0.1'," "" \
 
@@ -96,9 +100,12 @@ buildPythonPackage rec {
     azure-mgmt-compute
     azure-mgmt-keyvault
     azure-mgmt-network
+    azure-mgmt-resource
+    azure-mgmt-security
     azure-mgmt-storage
     azure-mgmt-web
     azure-storage-file
+    azure-storage-file-share
     bandit
     bcrypt
     beautifulsoup4
@@ -123,6 +130,7 @@ buildPythonPackage rec {
     psycopg2
     pycrypto
     pygments
+    pyhcl
     pyjks
     pynacl
     pyopenssl
@@ -146,9 +154,10 @@ buildPythonPackage rec {
     rm test/conftest.py
 
     pytest \
+      test/test_cloud_aws_terraform_{ebs,ec2}.py \
       test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
       test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
-      test/test_format_{apk,file,jks,jwt,pdf,pkcs12,string}.py \
+      test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \
       test/test_helper_{asynchronous,crypto}.py \
       test/test_lang_{javascript,java}.py \
       test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \

From d4119389bd7ec02e3a0bbd9b556b44d60f6a673e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 2 Dec 2019 23:49:50 -0500
Subject: [PATCH 563/755] dnnl: init at 1.1.2

This commit continues the work proposed in #68014, and provides an entirely FOSS
variant of the `dnnl` package. Updates to add an `mkl` flavor will be added
later, pending discussion about the cleanest way to overlay this consistently.

Fixes #67982, closes #68014

Co-authored-by: Alex Rice <alexrice999@hotmail.co.uk>
---
 .../libraries/dnnl/bash-to-sh.patch           | 13 +++++++
 pkgs/development/libraries/dnnl/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/dnnl/bash-to-sh.patch
 create mode 100644 pkgs/development/libraries/dnnl/default.nix

diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/pkgs/development/libraries/dnnl/bash-to-sh.patch
new file mode 100644
index 000000000000..063d9ef952be
--- /dev/null
+++ b/pkgs/development/libraries/dnnl/bash-to-sh.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index f6810246..e1d2a1f1 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -72,7 +72,7 @@ if(UNIX OR MINGW)
+     set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c")
+     add_custom_command(
+         OUTPUT ${test_c_symbols}
+-        COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
++        COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
+         ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs}
+     )
+     register_exe(test_c_symbols-c ${test_c_symbols} "test")
diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
new file mode 100644
index 000000000000..8a02ea1598c6
--- /dev/null
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
+
+stdenv.mkDerivation rec {
+  pname = "dnnl";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "mkl-dnn";
+    rev = "v${version}";
+    sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1";
+  };
+
+  # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631
+  # Delete patch when 1.2.0 is released
+  patches = [ (substituteAll {
+    src = ./bash-to-sh.patch;
+    inherit bash;
+  }) ];
+
+  outputs = [ "out" "dev" "doc" ];
+
+  nativeBuildInputs = [ cmake ];
+
+  # The test driver doesn't add an RPath to the build libdir
+  preCheck = ''
+    export LD_LIBRARY_PATH=$PWD/src
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Deep Neural Network Library (DNNL)";
+    homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ alexarice bhipple ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d299c1eb9b90..59492df5236a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11220,6 +11220,8 @@ in
 
   dhex = callPackage ../applications/editors/dhex { };
 
+  dnnl = callPackage ../development/libraries/dnnl { };
+
   double-conversion = callPackage ../development/libraries/double-conversion { };
 
   dclib = callPackage ../development/libraries/dclib { };

From 7f142260d38e586fe1e182a650fa32e199a96370 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 16 Dec 2019 16:31:09 +1100
Subject: [PATCH 564/755] manta: init 1.6.0

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

diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/applications/science/biology/manta/default.nix
new file mode 100644
index 000000000000..f0f0575e055a
--- /dev/null
+++ b/pkgs/applications/science/biology/manta/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, python2 }:
+
+stdenv.mkDerivation rec {
+  pname = "manta";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "Illumina";
+    repo = "manta";
+    rev = "v${version}";
+    sha256 = "1711xkcw8rpw9xv3bbm7v1aryjz4r341rkq5255192dg38sgq7w2";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib python2 ];
+  postFixup = ''
+    sed -i 's|/usr/bin/env python2|${python2.interpreter}|' $out/lib/python/makeRunScript.py
+    sed -i 's|/usr/bin/env python|${python2.interpreter}|' $out/lib/python/pyflow/pyflow.py
+    sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/python/pyflow/pyflowTaskWrapper.py
+  '';
+  doInstallCheck = true;
+  installCheckPhase = ''
+    rm $out/lib/python/**/*.pyc
+    PYTHONPATH=$out/lib/python:$PYTHONPATH python -c 'import makeRunScript'
+    PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Structural variant caller";
+    license = licenses.gpl3;
+    homepage = "https://github.com/Illumina/manta";
+    maintainers = with maintainers; [ jbedo ];
+    platforms =  platforms.x86_64;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59492df5236a..fed4a37a88f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23907,6 +23907,8 @@ in
 
   niftyseg = callPackage ../applications/science/biology/niftyseg { };
 
+  manta = callPackage ../applications/science/biology/manta { };
+
   octopus-caller = callPackage ../applications/science/biology/octopus { };
 
   paml = callPackage ../applications/science/biology/paml { };

From c4b458fa53c0c436e137d309de3358dfa6550ef6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 04:20:00 -0500
Subject: [PATCH 565/755] mutagen: 0.10.2 -> 0.10.3

Changelog: https://github.com/mutagen-io/mutagen/releases/tag/v0.10.3
---
 pkgs/tools/misc/mutagen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index 7045a5b5140d..3c355dbddf31 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mutagen";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0andmgzg2dbnahfh6ncnk9b7d5jlwss7rddsf9z3nmw2q3lj90iz";
+    sha256 = "18wjzylxypvisfdmmwqc8g9vd9w7iyhs8irad1ksf7fhwz9w188m";
   };
 
   modSha256 = "0zb6wqfgp5v0hpm8ad6s9lc1n3wayyqindv4vfkmp3980ikb8qwx";

From f26bafe1447304dca1544c67127dcfd4f6adc328 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:20:00 -0500
Subject: [PATCH 566/755] flexget: 3.1.10 -> 3.1.11

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 736137783651..7879fe5d8166 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FlexGet";
-  version = "3.1.10";
+  version = "3.1.11";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "d16c519630350dd1ca867529970b47438950f078e16f9f1d37bc3f027666bda4";
+    sha256 = "0ff053e4f9e01334ffb2f4a45590fe0e3e49dd2c21ae19d433c63dcbfe618a01";
   };
 
   postPatch = ''

From d9c847236b914f76cd8033ac64e69b86c2a2e2b7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 19 Nov 2019 14:18:16 -0600
Subject: [PATCH 567/755] light: 1.2 -> 1.2.1

https://github.com/haikarainen/light/releases/tag/v1.2.1
---
 pkgs/os-specific/linux/light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 6a0dd34d021d..e9ee69ca03ec 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.2.1";
   pname = "light";
   src = fetchFromGitHub {
     owner = "haikarainen";
     repo = "light";
     rev = "v${version}";
-    sha256 = "1h286va0r1xgxlnxfaaarrj3qhxmjjsivfn3khwm0wq1mhkfihra";
+    sha256 = "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg";
   };
 
   configureFlags = [ "--with-udev" ];

From f1a7a7b3c441d0c0aa5e7a43a6c007d1f12583fc Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 13:57:44 +0200
Subject: [PATCH 568/755] jetbrains.jdk: 485.1 -> 520.30

---
 pkgs/development/compilers/jetbrains-jdk/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 276b9ae150a0..54d95fbd8a88 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,17 +7,17 @@
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "485.1";
+  version = "520.30";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz";
-      sha256 = "18jnn0dra9nsnyllwq0ljxzr58k2pg8d0kg10y39vnxwccic4f76";
+      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-linux-x64-b${version}.tar.gz";
+      sha256 = "0xmr5jjnr4af7byz5w01phyrrdyizfhqmwhs4k8ih566fkhyzj02";
     }
   else if stdenv.hostPlatform.system == "x86_64-darwin" then
     fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
-      sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
+      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-osx-x64-b${version}.tar.gz";
+      sha256 = "0wfcw66wv5rkkjzyzi9j7zk7c2fgi33ny09drgihxi2kdzyfrpcb";
     }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";

From d92862cacd4000d376102c00176ee632b419f7a3 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 13:58:40 +0200
Subject: [PATCH 569/755] jetbrains.clion: 2019.3.2 -> 2019.3.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 3286e3427445..a2ba7acd0c97 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0aksix22cbbxny68650qxjbbm1fmgbsnp97qix5kl5nx4y4yvlii"; /* updated by script */
+      sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From 62184866d1ea7a70df05afb10bc0c3b262b6d05c Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 13:59:12 +0200
Subject: [PATCH 570/755] jetbrains.datagrip: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a2ba7acd0c97..093c719f1141 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "1h7va6x625kxc2i22mnya64b1kb4vl5xgjxrv3lqwz725q5hkrxa"; /* updated by script */
+      sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";

From 60e24ff9d4e3c242bc09a93f9889b5166be1fe2f Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 13:59:44 +0200
Subject: [PATCH 571/755] jetbrains.idea-community: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 093c719f1141..1c4ede716724 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 = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* 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 = "0285jdh350dalvk76ajy57mi1yg1g905cnfhcjlb465bsxaw0z5n"; /* updated by script */
+      sha256 = "09vicd2czag07f2f7dy0mmcvz5kryv659m32zm9rlsr4nai1i3y3"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";

From 206003cab683d941e285f4e8f5c40924e263eb64 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 14:00:10 +0200
Subject: [PATCH 572/755] jetbrains.idea-ultimate: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 1c4ede716724..59298f26b71a 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 = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* 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-jbr.tar.gz";
-      sha256 = "0rb726nh2c7zxnpjcf6fyrpl29y9wgr6qhpb6hjxia2gzxab9jz0"; /* updated by script */
+      sha256 = "09lgdd7gkx94warjc7wah9w7s9lj81law8clavjjyjas8bhhf1hz"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";

From a7ebd849efa57e78e502d5d953bb2def347ef5f5 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 14:00:31 +0200
Subject: [PATCH 573/755] jetbrains.phpstorm: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 59298f26b71a..33a313b72a70 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "170ppd0inn3s1yxd5ybspzgx2il78838z900fpg2pznq2hi0rn2h"; /* updated by script */
+      sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";

From 0c364672d02e832c0522c1fec713595ed77d14f5 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 14:00:53 +0200
Subject: [PATCH 574/755] jetbrains.pycharm-community: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 33a313b72a70..8f43170026fd 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1cph2v7gaxikrvvdaz7ihk17qgdzrn86jamik9fijb8sjli3695v"; /* updated by script */
+      sha256 = "06dzqjsq6jqgv8askzskm0bllzm9i8rzmhkjsv4na2phvdxf6qi2"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";

From b2f641679262020d1adf97924fb27e9ab777badd Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 14:01:11 +0200
Subject: [PATCH 575/755] jetbrains.pycharm-professional: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8f43170026fd..f8d4d1793f34 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1bjijwc5f1is2920b497d395ckswhpxilmxaljb6pjwq4a2k8yzx"; /* updated by script */
+      sha256 = "1zp64pnzz2jy232g8fgkqmn34afbhbkkhgyb9z1v1qfb533p39ig"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";

From 741faf7d90682d0e15d681e3fc6bb8491ea7309b Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 23 Jan 2020 14:01:23 +0200
Subject: [PATCH 576/755] jetbrains.webstorm: 2019.3.1 -> 2019.3.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f8d4d1793f34..83dff4a4f29e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0qjqd1a44mdlpvv3l4sx2n5clirwxialzh6s2dlb0dibx8zvnckp"; /* updated by script */
+      sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";

From 30c2ac9efa641df286dab9ebdc5c27e107e84673 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 24 Jan 2020 12:00:00 +0000
Subject: [PATCH 577/755] heaptrack: wrap with wrapQtAppsHook

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

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 5aaf3d436ded..1e52c0e95c0a 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,10 +1,10 @@
 {
-  stdenv, fetchFromGitHub, cmake, extra-cmake-modules,
+  lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules,
   zlib, boost, libunwind, elfutils, sparsehash,
   qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "heaptrack";
   version = "1.1.0";
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Heap memory profiler for Linux";
     homepage = https://github.com/KDE/heaptrack;
     license = licenses.lgpl21Plus;

From 8bab2dec10d8a0ef05145ab2edd37ba3ed7e9159 Mon Sep 17 00:00:00 2001
From: Jan Hrnko <jan.hrnko@satoshilabs.com>
Date: Wed, 25 Dec 2019 23:04:55 +0100
Subject: [PATCH 578/755] nixos/dokuwiki: init module at 2018-04-22b

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/web-apps/dokuwiki.nix | 272 +++++++++++++++++++
 nixos/tests/all-tests.nix                    |   1 +
 nixos/tests/dokuwiki.nix                     |  29 ++
 pkgs/servers/web-apps/dokuwiki/default.nix   |  31 ++-
 5 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/web-apps/dokuwiki.nix
 create mode 100644 nixos/tests/dokuwiki.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8e373550bb30..93415408e718 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -797,6 +797,7 @@
   ./services/web-apps/codimd.nix
   ./services/web-apps/cryptpad.nix
   ./services/web-apps/documize.nix
+  ./services/web-apps/dokuwiki.nix
   ./services/web-apps/frab.nix
   ./services/web-apps/gotify-server.nix
   ./services/web-apps/icingaweb2/icingaweb2.nix
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
new file mode 100644
index 000000000000..07af7aa0dfec
--- /dev/null
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -0,0 +1,272 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types;
+
+  cfg = config.services.dokuwiki;
+
+  user = config.services.nginx.user;
+  group = config.services.nginx.group;
+
+  dokuwikiAclAuthConfig = pkgs.writeText "acl.auth.php" ''
+    # acl.auth.php
+    # <?php exit()?>
+    #
+    # Access Control Lists
+    #
+    ${toString cfg.acl}
+  '';
+
+  dokuwikiLocalConfig = pkgs.writeText "local.php" ''
+    <?php
+    $conf['savedir'] = '${cfg.stateDir}';
+    $conf['superuser'] = '${toString cfg.superUser}';
+    $conf['useacl'] = '${toString cfg.aclUse}';
+    ${toString cfg.extraConfig}
+  '';
+
+  dokuwikiPluginsLocalConfig = pkgs.writeText "plugins.local.php" ''
+    <?php
+    ${cfg.pluginsConfig}
+  '';
+
+in
+{
+  options.services.dokuwiki = {
+    enable = mkEnableOption "DokuWiki web application.";
+
+    hostName = mkOption {
+      type = types.str;
+      default = "localhost";
+      description = "FQDN for the instance.";
+    };
+
+    stateDir = mkOption {
+      type = types.path;
+      default = "/var/lib/dokuwiki/data";
+      description = "Location of the dokuwiki state directory.";
+    };
+
+    acl = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
+      example = "*               @ALL               8";
+      description = ''
+        Access Control Lists: see <link xlink:href="https://www.dokuwiki.org/acl"/>
+        Mutually exclusive with services.dokuwiki.aclFile
+        Set this to a value other than null to take precedence over aclFile option.
+      '';
+    };
+
+    aclFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl
+        Mutually exclusive with services.dokuwiki.acl which is preferred.
+        Consult documentation <link xlink:href="https://www.dokuwiki.org/acl"/> for further instructions.
+        Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist"/>
+      '';
+    };
+
+    aclUse = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Necessary for users to log in into the system.
+        Also limits anonymous users. When disabled,
+        everyone is able to create and edit content.
+      '';
+    };
+
+    pluginsConfig = mkOption {
+      type = types.lines;
+      default = ''
+        $plugins['authad'] = 0;
+        $plugins['authldap'] = 0;
+        $plugins['authmysql'] = 0;
+        $plugins['authpgsql'] = 0;
+      '';
+      description = ''
+        List of the dokuwiki (un)loaded plugins.
+      '';
+    };
+
+    superUser = mkOption {
+      type = types.nullOr types.str;
+      default = "@admin";
+      description = ''
+        You can set either a username, a list of usernames (“admin1,admin2”), 
+        or the name of a group by prepending an @ char to the groupname
+        Consult documentation <link xlink:href="https://www.dokuwiki.org/config:superuser"/> for further instructions.
+      '';
+    };
+
+    usersFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Location of the dokuwiki users file. List of users. Format:
+        login:passwordhash:Real Name:email:groups,comma,separated 
+        Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1`
+        Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/users.auth.php.dist"/>
+        '';
+    };
+
+    extraConfig = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
+      example = ''
+        $conf['title'] = 'My Wiki';
+        $conf['userewrite'] = 1;
+      '';
+      description = ''
+        DokuWiki configuration. Refer to
+        <link xlink:href="https://www.dokuwiki.org/config"/>
+        for details on supported values.
+      '';
+    };
+
+    poolConfig = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool ]);
+      default = {
+        "pm" = "dynamic";
+        "pm.max_children" = 32;
+        "pm.start_servers" = 2;
+        "pm.min_spare_servers" = 2;
+        "pm.max_spare_servers" = 4;
+        "pm.max_requests" = 500;
+      };
+      description = ''
+        Options for the dokuwiki PHP pool. See the documentation on <literal>php-fpm.conf</literal>
+        for details on configuration directives.
+      '';
+    };
+
+    nginx = mkOption {
+      type = types.submodule (
+        recursiveUpdate
+          (import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
+          {
+            # Enable encryption by default,
+            options.forceSSL.default = true;
+            options.enableACME.default = true;
+          }
+      );
+      default = {forceSSL = true; enableACME = true;};
+      example = {
+        serverAliases = [
+          "wiki.\${config.networking.domain}"
+        ];
+        enableACME = false;
+      };
+      description = ''
+        With this option, you can customize the nginx virtualHost which already has sensible defaults for DokuWiki.
+      '';
+    };
+  };
+
+  # implementation
+
+  config = mkIf cfg.enable {
+
+    warnings = mkIf (cfg.superUser == null) ["Not setting services.dokuwiki.superUser will impair your ability to administer DokuWiki"];
+
+    assertions = [ 
+      {
+        assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null);
+        message = "Either services.dokuwiki.acl or services.dokuwiki.aclFile is mandatory when aclUse is true";
+      }
+      {
+        assertion = cfg.usersFile != null -> cfg.aclUse != false;
+        message = "services.dokuwiki.aclUse must be true when usersFile is not null";
+      }
+    ];
+
+    services.phpfpm.pools.dokuwiki = {
+      inherit user;
+      inherit group;
+      phpEnv = {        
+        DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig}";
+        DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig}";
+      } //optionalAttrs (cfg.usersFile != null) {
+        DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}";
+      } //optionalAttrs (cfg.aclUse) {
+        DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig}" else "${toString cfg.aclFile}";
+      };
+      
+      settings = {
+        "listen.mode" = "0660";
+        "listen.owner" = user;
+        "listen.group" = group;
+      } // cfg.poolConfig;
+    };
+
+    services.nginx = {
+      enable = true;
+      
+       virtualHosts = {
+        ${cfg.hostName} = mkMerge [ cfg.nginx {
+          root = mkForce "${pkgs.dokuwiki}/share/dokuwiki/";
+          extraConfig = "fastcgi_param HTTPS on;";
+
+          locations."~ /(conf/|bin/|inc/|install.php)" = {
+            extraConfig = "deny all;";
+          };
+
+          locations."~ ^/data/" = {
+            root = "${cfg.stateDir}";
+            extraConfig = "internal;";
+          };
+
+          locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = {
+            extraConfig = "expires 365d;";
+          };
+
+          locations."/" = {
+            priority = 1;
+            index = "doku.php";
+            extraConfig = ''try_files $uri $uri/ @dokuwiki;'';
+          };
+
+          locations."@dokuwiki" = {
+            extraConfig = ''
+              # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki config page
+              rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+              rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+              rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+              rewrite ^/(.*) /doku.php?id=$1&$args last;
+            '';
+          };
+
+          locations."~ \.php$" = {
+            extraConfig = ''
+              try_files $uri $uri/ /doku.php;
+              include ${pkgs.nginx}/conf/fastcgi_params;
+              fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+              fastcgi_param REDIRECT_STATUS 200;
+              fastcgi_pass unix:${config.services.phpfpm.pools.dokuwiki.socket};
+              fastcgi_param HTTPS on;
+            '';
+          };
+        }];
+      };
+
+    };
+
+    systemd.tmpfiles.rules = [
+      "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/index 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/media 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -"
+      "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -"
+    ];
+
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 35a02d2e2833..542d5c61d271 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -71,6 +71,7 @@ in
   docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
   docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
   documize = handleTest ./documize.nix {};
+  dokuwiki = handleTest ./dokuwiki.nix {};
   dovecot = handleTest ./dovecot.nix {};
   # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access
   #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
new file mode 100644
index 000000000000..38bde10f47ed
--- /dev/null
+++ b/nixos/tests/dokuwiki.nix
@@ -0,0 +1,29 @@
+import ./make-test-python.nix ({ lib, ... }:
+
+with lib;
+
+{
+  name = "dokuwiki";
+  meta.maintainers = with maintainers; [ maintainers."1000101" ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    { services.dokuwiki = {
+        enable = true;
+        acl = " ";
+        superUser = null;
+        nginx = {
+          forceSSL = false;
+          enableACME = false;
+        };
+      }; 
+    };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("phpfpm-dokuwiki.service")
+    machine.wait_for_unit("nginx.service")
+    machine.wait_for_open_port(80)
+    machine.succeed("curl -sSfL http://localhost/ | grep 'DokuWiki'")
+  '';
+})
diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix
index ff6fa982228c..f12a75c8e18b 100644
--- a/pkgs/servers/web-apps/dokuwiki/default.nix
+++ b/pkgs/servers/web-apps/dokuwiki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, writeText }:
 
 stdenv.mkDerivation rec {
   pname = "dokuwiki";
@@ -11,9 +11,38 @@ stdenv.mkDerivation rec {
     sha256 = "1na5pn4j4mi2la80ywzg1krwqdxz57mjkw0id6ga9rws809gkdjp";
   };
 
+  preload = writeText "preload.php" ''
+  <?php
+
+    $config_cascade = array(
+      'acl' => array(
+        'default'   => getenv('DOKUWIKI_ACL_AUTH_CONFIG'),
+      ),
+      'plainauth.users' => array(
+        'default'   => getenv('DOKUWIKI_USERS_AUTH_CONFIG'),
+        'protected' => "" // not used by default
+      ),
+    );
+  '';
+
+  phpLocalConfig = writeText "local.php" ''
+  <?php
+    return require(getenv('DOKUWIKI_LOCAL_CONFIG'));
+  ?>
+  '';
+
+  phpPluginsLocalConfig = writeText "plugins.local.php" ''
+  <?php
+    return require(getenv('DOKUWIKI_PLUGINS_LOCAL_CONFIG'));
+  ?>
+  '';
+
   installPhase = ''
     mkdir -p $out/share/dokuwiki
     cp -r * $out/share/dokuwiki
+    cp ${preload} $out/share/dokuwiki/inc/preload.php
+    cp ${phpLocalConfig} $out/share/dokuwiki/conf/local.php
+    cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
   '';
 
   meta = with stdenv.lib; {

From 7f723b128b28fbfdb220547672e77cfd82457902 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Jan 2020 13:33:58 +0100
Subject: [PATCH 579/755] cargo-make: 0.26.1 -> 0.26.2

https://github.com/sagiegurari/cargo-make/releases/tag/0.26.2
---
 .../tools/rust/cargo-make/Cargo.lock          | 465 ++++++++++++------
 .../tools/rust/cargo-make/default.nix         |  13 +-
 2 files changed, 322 insertions(+), 156 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index bcf708735f62..de4e6f080bc8 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -1,5 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "adler32"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.6"
@@ -26,6 +31,19 @@ name = "arrayvec"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "attohttpc"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -36,38 +54,20 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "autocfg"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "backtrace"
-version = "0.3.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "base64"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "bitflags"
@@ -85,8 +85,8 @@ dependencies = [
 ]
 
 [[package]]
-name = "byteorder"
-version = "1.3.2"
+name = "bytes"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -99,15 +99,15 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.26.1"
+version = "0.26.2"
 dependencies = [
- "ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -115,7 +115,7 @@ dependencies = [
  "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "run_script 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -146,10 +146,10 @@ dependencies = [
 
 [[package]]
 name = "ci_info"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -166,14 +166,6 @@ dependencies = [
  "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "colored"
 version = "1.9.2"
@@ -190,10 +182,33 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
+name = "core-foundation"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "crc32fast"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -214,21 +229,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "duckscript"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "duckscriptsdk"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -297,32 +313,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "envmnt"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "fern"
 version = "0.5.9"
@@ -332,19 +328,38 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "fs_extra"
-version = "1.1.0"
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
+name = "fs_extra"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -393,6 +408,26 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.3.1"
@@ -402,6 +437,11 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "java-properties"
 version = "1.2.0"
@@ -434,6 +474,11 @@ name = "match_cfg"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "memchr"
 version = "2.3.0"
@@ -448,6 +493,31 @@ dependencies = [
  "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nom"
 version = "1.2.4"
@@ -470,6 +540,46 @@ dependencies = [
  "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.6"
@@ -512,19 +622,6 @@ dependencies = [
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -541,27 +638,6 @@ dependencies = [
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.1.56"
@@ -569,13 +645,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "redox_users"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -594,9 +669,17 @@ name = "regex-syntax"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "remove_dir_all"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "run_script"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -605,12 +688,13 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -618,11 +702,6 @@ name = "rust_info"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -631,6 +710,34 @@ dependencies = [
  "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -656,7 +763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -667,6 +774,11 @@ dependencies = [
  "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -674,7 +786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -683,14 +795,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.12.3"
+name = "tempfile"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -727,6 +841,22 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@@ -737,6 +867,16 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "url"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "users"
 version = "0.9.1"
@@ -745,6 +885,11 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vec_map"
 version = "0.8.1"
@@ -793,32 +938,35 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+"checksum attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45"
 "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b4b1549d804b6c73f4817df2ba073709e96e426f12987127c48e6745568c350b"
-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
-"checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a"
+"checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
 "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum duckscript 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b5394d82936cc15539317618b25d532c7fc36415eb8c1ca4c3fd263c104e6145"
-"checksum duckscriptsdk 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3053a419a5bf69b015c8a9d42d82f2fffdf106f9353384d9f5c1819b68dc6141"
+"checksum duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ce2dedb6f752438ee1eaf67cb8f8b1008945ba59cba042325681bd97d683520"
+"checksum duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "701d0a8d1e0c645d1ce5c959493e0166819d7afda998b8ec73659aa5afe127aa"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
 "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@@ -826,65 +974,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-"checksum envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "39cdd9fdbf10b8cfa59dd70ef823cbaa83e33b86f4ad291ae67b16f4bd37bc69"
-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352"
 "checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f"
 "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
 "checksum hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01b1af8d6d068ba9de1c39c6ff0d879aed20f74873d4d3929a4535000bb07886"
+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
 "checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
 "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
+"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
 "checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
 "checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
-"checksum run_script 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c0159ae870920e692ef9226b56b831d50abca091e588e43972f3e099b40ca7f"
-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+"checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac"
+"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
 "checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d"
-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 "checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65"
+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 "checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf"
+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index bbad7ee731bd..d596e51b275f 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security }:
+{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src =
     let
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "04h8vr8k790kkn09yrqv7py0sn2fmj4b51c4kjhplr0pcxkbdbdn";
+        sha256 = "022krw38kyvv9wr8v7rnwp21d64pdiivwgvbmdix725dlypl43h4";
       };
     in
     runCommand "cargo-make-src" {} ''
@@ -19,9 +19,12 @@ rustPlatform.buildRustPackage rec {
       cp ${./Cargo.lock} $out/Cargo.lock
     '';
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = [ pkg-config ];
 
-  cargoSha256 = "05m966h58mgq1bm92yfzzpd4ivlv4jh5fy1kfazcfsfw2k0kqmka";
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  cargoSha256 = "10ij0k428ia9yy8j1dr9f6xf1cgc8778prry4bp8ribd3wymxs1j";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 93c7301338ac1eaf7ad7b687fa477aa86790628f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 24 Jan 2020 13:45:11 +0100
Subject: [PATCH 580/755] gnomeExtensions.gsconnect: 30 -> 31 (#78359)

No longer depends on libfolks :)

https://github.com/andyholmes/gnome-shell-extension-gsconnect/releases/tag/v31
---
 .../gnome-3/extensions/gsconnect/default.nix     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 5858883accdc..08011ab5c722 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound
+{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound
 , meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
 , glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "30";
+  version = "31";
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "17j96y72mj7vg2csn5c9rji7jy04x5qzl8knf5gky6wppxj9zjb4";
+    sha256 = "0nricm31jh4akncs0rkkilmq9afg7kgbj5cy7w26pfqb3l4nhifg";
   };
 
   patches = [
@@ -29,11 +29,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    (python3.withPackages (pkgs: [ python3.pkgs.pygobject3 ])) # for folks.py
     glib # libgobject
     gtk3
     at-spi2-core # atspi
-    folks # libfolks
     gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension
     gnome3.nautilus-python
     gsound
@@ -66,15 +64,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  preFixup = ''
-    # TODO: figure out why folks GIR does not contain shared-library attribute
-    # https://github.com/NixOS/nixpkgs/issues/47226
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}")
-  '';
-
   postFixup = ''
     # Let’s wrap the daemons
-    for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
+    for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
       echo "Wrapping program $file"
       wrapGApp "$file"
     done

From a7a0d44b583c45119a8f2c3494c178ed7a1449f5 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 24 Jan 2020 14:16:15 +0100
Subject: [PATCH 581/755] EmptyEpsilon: 2019.11.01 -> 2020.01.15

---
 pkgs/games/empty-epsilon/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 17d503de1f75..6560db48cb34 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  major = "2019";
-  minor = "11";
-  patch = "01";
+  major = "2020";
+  minor = "01";
+  patch = "15";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "1sc1z9n99jspa8jnk0pwdzynnadvcmb3pxl5cndw3z90xjwpzivw";
+      sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "09jizc6h7jbsp8bzv05pvb5z24zadjzjx1slj5317axsb170v81p";
+    sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk";
   };
 
   nativeBuildInputs = [ cmake ];

From 88de34b160cec2915cb8ee4f5cd08542874eeaa6 Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Fri, 24 Jan 2020 14:52:44 +0100
Subject: [PATCH 582/755] zfs: 0.8.2 -> 0.8.3

---
 pkgs/os-specific/linux/zfs/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index ae72aad6c077..738171bb5ec8 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -56,6 +56,22 @@ let
         substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
         substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
         substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+
+        substituteInPlace ./contrib/initramfs/hooks/Makefile.am \
+          --replace "/usr/share/initramfs-tools/hooks" "$out/usr/share/initramfs-tools/hooks"
+        substituteInPlace ./contrib/initramfs/Makefile.am \
+          --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"
+        substituteInPlace ./contrib/initramfs/scripts/Makefile.am \
+          --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts"
+        substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \
+          --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"
+        substituteInPlace ./contrib/initramfs/scripts/Makefile.am \
+          --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts"
+        substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \
+          --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"
+        substituteInPlace ./etc/systemd/system/Makefile.am \
+          --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)'
+
         substituteInPlace ./etc/systemd/system/zfs-share.service.in \
           --replace "/bin/rm " "${coreutils}/bin/rm "
 
@@ -163,9 +179,9 @@ in {
     # incompatibleKernelVersion = "4.20";
 
     # this package should point to the latest release.
-    version = "0.8.2";
+    version = "0.8.3";
 
-    sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
+    sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw";
   };
 
   zfsUnstable = common {
@@ -173,9 +189,9 @@ in {
     # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "0.8.2";
+    version = "0.8.3";
 
-    sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
+    sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw";
     isUnstable = true;
   };
 }

From de193e105d2e20d2a37c5cef5d82d8009022378d Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Fri, 24 Jan 2020 15:01:47 +0100
Subject: [PATCH 583/755] mill: 0.5.6 -> 0.6.0

---
 pkgs/development/tools/build-managers/mill/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index c2cc553f86d1..ab9ba1758d00 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mill";
-  version = "0.5.6";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
-    sha256 = "16fjbgsy6fz1vw1s883z7xv380525rr47j7pcc365p5nm8y1hfp1";
+    sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8a9fffcd62b592cd170d27fa93f2cf7d361449e7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 24 Jan 2020 07:30:00 -0500
Subject: [PATCH 584/755] jetbrains-mono: 1.0.1 -> 1.0.2

Changelog: https://github.com/JetBrains/JetBrainsMono/releases/tag/v1.0.2
---
 pkgs/data/fonts/jetbrains-mono/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index ada7f23f4211..21c598b6cddf 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchzip }:
 
 let
-  version = "1.0.1";
+  version = "1.0.2";
 in
 fetchzip rec {
   name = "JetBrainsMono-${version}";
 
-  url = "https://github.com/JetBrains/JetBrainsMono/releases/download/${version}/JetBrainsMono-${version}.zip";
+  url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
 
-  sha256 = "15a8fwyg8ns6krq6nsvgn41iaqbd3lgm3cmv7w370gr6brbn6lxq";
+  sha256 = "0fyn7yb1m9gkzbbzv25f8v6qzv7w4amqv3z4fpfb262l1f6yq41i";
 
   postFetch = ''
-    unzip $downloadedFile
-    install -m444 -Dt $out/share/fonts/truetype ttf/*.ttf
-    install -m444 -Dt $out/share/fonts/woff/ web/woff/*.woff
-    install -m444 -Dt $out/share/fonts/woff2/ web/woff2/*.woff2
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
+    unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
   '';
 
   meta = with lib; {

From 966e56cdfbedc8be3dce8c5ea6050ce4d3075103 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 22 Jan 2020 23:44:50 -0500
Subject: [PATCH 585/755] nixos/xfce: use sessionPackages

---
 .../services/x11/desktop-managers/xfce.nix    | 11 +++-------
 .../xfce/core/xfce4-session/default.nix       | 22 ++++++++++++++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index a08b1947f65b..21f59074f3ae 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -127,14 +127,9 @@ in
       "/share/gtksourceview-4.0"
     ];
 
-    services.xserver.desktopManager.session = [{
-      name = "xfce";
-      bgSupport = true;
-      start = ''
-        ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
-        waitPID=$!
-      '';
-    }];
+    services.xserver.displayManager.sessionPackages = [
+      pkgs.xfce.xfce4-session
+    ];
 
     services.xserver.updateDbusEnvironment = true;
     services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
index 0ab362aa21d0..f97c07156c58 100644
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
+{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session, runtimeShell }:
 
 mkXfceDerivation {
   category = "xfce";
@@ -14,9 +14,25 @@ mkXfceDerivation {
   # See https://github.com/NixOS/nixpkgs/issues/36468
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
-  passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
+  # Don't use startxfce4 in xfce.desktop
+  # It's has FHS isms
+  postFixup = ''
+    chmod +x $out/etc/xdg/xfce4/xinitrc
+    patchShebangs $out/etc/xdg/xfce4/xinitrc
 
-  meta =  {
+    substituteInPlace "$out/share/xsessions/xfce.desktop" \
+      --replace "Exec=startxfce4" "Exec=$out/etc/xdg/xfce4/xinitrc"
+  '';
+
+  passthru = {
+    xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
+
+    providedSessions = [
+      "xfce"
+    ];
+  };
+
+  meta = {
     description = "Session manager for Xfce";
   };
 }

From bfe1c69ede273ec56c848e424527ca8d1ffa3193 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Mon, 13 Jan 2020 19:10:32 +0000
Subject: [PATCH 586/755] nixos/gnupg: actually use the configured gpg package

Previously, this would ignore the `package` option if `pinentryFlavor`
was set.
---
 nixos/modules/programs/gnupg.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 2d262d906579..7a3cb588ee71 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -96,7 +96,7 @@ in
     # This overrides the systemd user unit shipped with the gnupg package
     systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
       serviceConfig.ExecStart = [ "" ''
-        ${pkgs.gnupg}/bin/gpg-agent --supervised \
+        ${cfg.package}/bin/gpg-agent --supervised \
           --pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
       '' ];
     };

From 0bb5075c62f768590e28c504701694cf932cdb50 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:15:31 -0500
Subject: [PATCH 587/755] linux: 4.14.166 -> 4.14.167

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 71b626479ba2..ba2b1ddb61b3 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.166";
+  version = "4.14.167";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "003wax7dsahlv1iv9yqhkjbxx20crmwyd9464cx974i03a0vzclb";
+    sha256 = "0hzyb5k6adhg4vkhix21kg7z6gdzyk1dnzylvbsz9yh2m73qzdrb";
   };
 } // (args.argsOverride or {}))

From fd2ddc32887a1802808004af9f4102306c19f660 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:16:38 -0500
Subject: [PATCH 588/755] linux: 4.19.97 -> 4.19.98

---
 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 fc0caad7406f..9512729bc34d 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.97";
+  version = "4.19.98";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1nln2ksfm0ddkqdmhvxwzqq96av1myx89kr1wxs54m2yw0la7clg";
+    sha256 = "0dr9vnaaycq77r49mj001zvkxhdyxkgh27dbjsaxcq1dq8xv3zli";
   };
 } // (args.argsOverride or {}))

From 53616e8c4ee6a2fe3bb4a2c83de10e7ee28fe021 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:16:52 -0500
Subject: [PATCH 589/755] linux: 4.4.210 -> 4.4.211

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0651232f91fc..0e3d0db2b950 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.210";
+  version = "4.4.211";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pg754s3138d2lq5y2zd1z7dagdy8pl4ifmp0754sa1rkjd3h0ns";
+    sha256 = "1f6qz4bvjn18cfcg3wwfsl75aw2kxwn28r228kdic9aibhy6rpvp";
   };
 } // (args.argsOverride or {}))

From 35da29dd68df698a052b1b50960c66ec9777d435 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:17:10 -0500
Subject: [PATCH 590/755] linux: 4.9.210 -> 4.9.211

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 7c649bd9b57b..6efc22e0d34a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.210";
+  version = "4.9.211";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04skcbbp1yv54hwipa1pjx04lb21013r0lh2swycq0kdhc1m54d0";
+    sha256 = "1gmi27ih5ys1wxbrnc4a5dr9vw9ngccs9xpa2p0gsk4pbn6n15r5";
   };
 } // (args.argsOverride or {}))

From 461e8d1d59fc13c147f5bda4d07e7c34e14233fc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:17:37 -0500
Subject: [PATCH 591/755] linux: 5.4.13 -> 5.4.14

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 9b1ebeeb4898..ae14bc676fd0 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.13";
+  version = "5.4.14";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1mva73ywb2r5lrmzp5m7hyy0zpgxdg91nw42c1z1sz3ydpcjkys9";
+    sha256 = "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk";
   };
 } // (args.argsOverride or {}))

From 30ad9a98d4e2916f7fb87a78c0612d2f3dc9ae8c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:18:02 -0500
Subject: [PATCH 592/755] linux_latest-libre: 17198 -> 17262

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 5102a1c2086b..fab4fd6aaedc 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17198";
-    sha256 = "0cr7jpag6kr3iili5zmv1iimi5a1c175dcj8qvhcspwkbv7f17mp";
+    rev = "17262";
+    sha256 = "0g1jwhzmbyf11jnbd6svb48b8ga4gd43lx1hx1jkqaa5ijvw1smr";
   }
 , ...
 }:

From 62d86db572901a960838d4d5acadc039b207cfef Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 24 Jan 2020 11:31:18 -0500
Subject: [PATCH 593/755] zoom-us: 3.5.336627.1216 -> 3.5.352596.0119

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 972d7c13a283..cc19bbd7156f 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.336627.1216";
+  version = "3.5.352596.0119";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "04r45z2rjjn9gr7bxhfwg49xkyhmpcn5y6pdbkdnrfwzaqzisavz";
+      sha256 = "1h8wki0b920k0hcy812w91ara59z4rmfllxx04nbmzsxh0bvsx90";
     };
   };
 

From 9cf50fa55c2d67be4ccea9a9b8c2f15321ca9a13 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 24 Jan 2020 13:21:04 +0100
Subject: [PATCH 594/755] signal-desktop: 1.29.6 -> 1.30.0

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v1.30.0
---
 .../signal-desktop/default.nix                | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index bc41b0236274..4358ed8f2019 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
+{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook
 , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
 , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
 , cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3
-, autoPatchelfHook
 # Unfortunately this also overwrites the UI language (not just the spell
 # checking language!):
 , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -24,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.29.6"; # Please backport all updates to the stable channel.
+  version = "1.30.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -34,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1s1rc4kyv0nxz5fy5ia7fflphf3izk80ks71q4wd67k1g9lvcw24";
+    sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i";
   };
 
   nativeBuildInputs = [
@@ -88,12 +87,20 @@ in stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
   dontPatchELF = true;
+  # We need to run autoPatchelf manually with the "no-recurse" option, see
+  # https://github.com/NixOS/nixpkgs/pull/78413 for the reasons.
+  dontAutoPatchelf = true;
 
   installPhase = ''
     mkdir -p $out/lib
 
     mv usr/share $out/share
-    mv opt/Signal $out/lib
+    mv opt/Signal $out/lib/Signal
+
+    # Note: The following path contains bundled libraries:
+    # $out/lib/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/
+    # We run autoPatchelf with the "no-recurse" option to avoid picking those
+    # up, but resources/app.asar still requires them.
 
     # Symlink to bin
     mkdir -p $out/bin
@@ -109,6 +116,8 @@ in stdenv.mkDerivation rec {
     # Fix the desktop link
     substituteInPlace $out/share/applications/signal-desktop.desktop \
       --replace /opt/Signal/signal-desktop $out/bin/signal-desktop
+
+    autoPatchelf --no-recurse -- $out/lib/Signal/
   '';
 
   meta = {

From ed6e4a936c116fe4e9822b9b5b247aa013012ef7 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 24 Jan 2020 18:07:24 +0100
Subject: [PATCH 595/755] nixos/alertmanager: provide example of envsubst usage

---
 .../modules/services/monitoring/prometheus/alertmanager.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 3c9ca6c7d376..2e8433fbc888 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -133,8 +133,10 @@ in {
         default = null;
         example = "/root/alertmanager.env";
         description = ''
-          File to load as environment file. Useful to insert secrets
-          into the configuration (via envsubst).
+          File to load as environment file. Environment variables
+          from this file will be interpolated into the config file
+          using envsubst with this syntax:
+          <literal>$ENVIRONMENT ''${VARIABLE}</literal>
         '';
       };
     };

From 3ef51159639a2f9d660de0bb94d71b4afce85def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 24 Jan 2020 17:18:21 +0000
Subject: [PATCH 596/755] nixos/systemd: add all systemd tmpfiles files

Especially tmp.conf is important to create /tmp and /var/tmp with the correct
permissions.
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c438bb216e70..941df5797c66 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -869,11 +869,15 @@ in
       "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
       "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
 
+      "tmpfiles.d/home.conf".source = "${systemd}/example/tmpfiles.d/home.conf";
       "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
+      "tmpfiles.d/portables.conf".source = "${systemd}/example/tmpfiles.d/portables.conf";
       "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
       "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
+      "tmpfiles.d/systemd-nologin.conf".source = "${systemd}/example/tmpfiles.d/systemd-nologin.conf";
       "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/systemd-nspawn.conf";
       "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/systemd-tmp.conf";
+      "tmpfiles.d/tmp.conf".source = "${systemd}/example/tmpfiles.d/tmp.conf";
       "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
       "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 

From 3958cc3c4bd0f3e7190419f213a967d40330d9ba Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Tue, 21 Jan 2020 23:13:36 +0100
Subject: [PATCH 597/755] gavrasm: init at 4.5

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

diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix
new file mode 100644
index 000000000000..92781d79cc7f
--- /dev/null
+++ b/pkgs/development/compilers/gavrasm/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip, fpc , lang ? "en" } :
+assert stdenv.lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
+stdenv.mkDerivation rec {
+  pname = "gavrasm";
+  version = "4.5";
+
+  src = fetchzip {
+    url ="http://www.avr-asm-tutorial.net/gavrasm/v45/gavrasm_sources_lin_45.zip";
+    sha256 = "1f5g5ran74pznwj4g7vfqh2qhymaj3p26f2lvzbmlwq447iid52c";
+    stripRoot=false;
+  };
+
+  nativeBuildInputs = [ fpc ];
+
+  configurePhase = ''
+    cp gavrlang_${lang}.pas gavrlang.pas
+  '';
+
+  buildPhase = ''
+    fpc gavrasm.pas
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp gavrasm $out/bin
+    mkdir -p $out/doc
+    cp instr.asm $out/doc
+    cp ReadMe.Txt $out/doc
+    cp LiesMich.Txt $out/doc
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.avr-asm-tutorial.net/gavrasm;
+    description = "AVR Assembler for ATMEL AVR-Processors";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ mafo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f670f284982..23e4b40130b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19238,6 +19238,8 @@ in
 
   game-music-emu = callPackage ../applications/audio/game-music-emu { };
 
+  gavrasm = callPackage ../development/compilers/gavrasm { };
+
   gcalcli = callPackage ../applications/misc/gcalcli { };
 
   vcal = callPackage ../applications/misc/vcal { };

From 89864a01d12fa10724dca23c60e8b20ed9daff88 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Fri, 24 Jan 2020 14:07:58 +0100
Subject: [PATCH 598/755] dsniff: Unbreak the build

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

diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
index 9ddc1a35ce37..256e59628aa2 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ glib pcap ];
-  NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread";
+  NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl";
   postPatch = ''
     for patch in debian/patches/*.patch; do
       patch < $patch

From 15e98e74282d1611f1648ceecf4b8cb8537dad60 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 24 Jan 2020 18:59:13 +0100
Subject: [PATCH 599/755] nixos/vault: add ExecReload entry

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

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index b0ab8fadcbec..6a8a3a93327e 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -135,6 +135,7 @@ in
         User = "vault";
         Group = "vault";
         ExecStart = "${cfg.package}/bin/vault server -config ${configFile}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
         PrivateDevices = true;
         PrivateTmp = true;
         ProtectSystem = "full";

From 24b7d0de7be34a7612d13536963b8e35ec9b261a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 24 Jan 2020 19:05:23 +0100
Subject: [PATCH 600/755] iputils: Increase the priority to avoid collisions
 with inetutils (#78408)

The ping binary will be from iputils anyway since it's installed in
/run/wrappers/bin/ (first in $PATH) and tftpd will be from iputils as
well since inetutils installs it into libexec (not in $PATH).

Therefore, there's not even a real choice here (though we should most
likely prefer iputils anyway).

Current collisions:
collision between `/nix/store/...-iputils-20190709/bin/ping' and `/nix/store/...-inetutils-1.9.4/bin/ping'
collision between `/nix/store/...-iputils-20190709/share/man/man8/tftpd.8.gz' and `/nix/store/...-inetutils-1.9.4/share/man/man8/tftpd.8.gz'
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23e4b40130b2..9b4cba331d1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16259,7 +16259,8 @@ in
 
   iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };
 
-  iputils = callPackage ../os-specific/linux/iputils { };
+  iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
+  # hiPrio for collisions with inetutils (ping and tftpd.8.gz)
 
   iptables = iptables-legacy;
   iptables-legacy = callPackage ../os-specific/linux/iptables { };

From ef497b63ba741a17ab79b7eebbc3c9f0410c2ca2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 25 Jan 2020 03:12:19 +0900
Subject: [PATCH 601/755] thunderbird-bin: 68.4.1 -> 68.4.2

---
 .../thunderbird-bin/release_sources.nix       | 490 +++++++++---------
 1 file changed, 245 insertions(+), 245 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index bd2b9b96f567..13f201eaea11 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
 {
-  version = "68.4.1";
+  version = "68.4.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ar/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ar/thunderbird-68.4.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "04c20c0878b17d97666b907ed658e00b9d3d7f7cf1ad24cc3df29ccf937d5f79af3a31d80854f12006bc3e5ce0ed69b1bfc8c6515fa8ae1a54441ad6ca0de173";
+      sha512 = "6dcb7cf023c6b6e1d663eb99280aa8245c658a6faed7933be8d8340b33e47f2082d548e6d9fc4394a74ddf8b05c9a7b3a57f691504cb4095d41787ebb564b86b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ast/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ast/thunderbird-68.4.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "065d6b08193bce5142b3421ebe4bb81a072beba9fc54617cde0788094efe71a8d6aaaf0689960b3cb8a20c300d81c4e48e2fb0f0e76646b06954c5533a66b48b";
+      sha512 = "89592d5c44742b75d8125e4f360f6ef1a719f6a573c72ca3b88fe971be699d74d4326af7385f36e67c0d4ab09a23d7d8f62c8cfac27c9249f84f520b8ff46ab8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/be/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/be/thunderbird-68.4.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ff6d7018ae66ae502fcf9a50893ea29b38480d0607a973627dfb362c4987c777ac9ad3ae0aab0546af4e3117810cbfc02ba5a9b7abcef249c40e1b648a0d28d2";
+      sha512 = "5cd617c16a448f79335a1df7e7028eadbcf35b6221678da4c31e5cb5a014ccb9ff6020fa271488312853a5b08ae1e29102f470e9bed193f2de2e0b70cbee4752";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/bg/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/bg/thunderbird-68.4.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "6886a3063449d649e77f13c837516733d81f25985f8b480ae82ea35ecc2e7d1cd4edfd569321bed21b9e5e753c46397932bca65ea763c08d02b6be4680209746";
+      sha512 = "85221ff6c56119b603b291febacab6c92cad2d4e2f56415a778f9f06495dbc0c52380fba7dc2153853a689e804c7ef731ae762b0cee9a9ec92ead2184a7ce987";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/br/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/br/thunderbird-68.4.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7ca7b0e8e2986a926b82ba5e54a2e7949b8f22eab0d0c7f5ae8fc8489dc67cd971c8a6fbfa5d7293c96a778af58d56a765cfad42d6abef6b7dd56c84682a0f54";
+      sha512 = "e42c6569be589c543b1b3d23062733e61317ce2efb83b224f94571564c881c329b96d49a7c4be9a553d1eb656595212f839f8b4119b382782be6f1e55048cde0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ca/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ca/thunderbird-68.4.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "0b6e814f3c68ed721df12bd665b028e03dadde93c74396ec1912ee4bcd849a09d301173d21826f51d567405bebc80079f693976e4b396c265c5a84fd65160475";
+      sha512 = "31f8a8bddbf1f3be169c15cdd94d11cea472ff10abafee33619d0d53d51fbc862d8cf143d2924733cb8ee39751f1145ec7cad299b0d634d2269901d9a6a5f7f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/cak/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cak/thunderbird-68.4.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d520e404e8f3bb84be1af4277d7a646b1c8ba17bbcf850844b435cd0dc2337dc16025517cbb1459f4e09ddb698eaf6f5458c615bfea6d0db7ee462e5a484b741";
+      sha512 = "b8ad08b7abe314a4d1ba6a92bd5a3e1d43310738493ed130eb11549d0179f38ea435d0b246513ecd10a701c0fe65578fbf21ce3c47d9ad067a3a25a82ae590ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/cs/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cs/thunderbird-68.4.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b1e6cd45e5ba2c1d5dc5ad80e16bc79ce8e44c6bed9e99d736ed728adf544266f3ec4fc36f8f60c1ae2295b5ca02217f073981e503cfcc6d5710c4f5122dbe90";
+      sha512 = "5228af6fd773622fbd846993f1b48f480a2f0da4fde2a49c9b1663c9f72c8821d51093a121175bf57130670ba96aabc44d92fbdc895d1f5508e6301d148ae137";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/cy/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cy/thunderbird-68.4.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "42039478caf75c9c18ec05a1b42186a87aaef3e3be9a1fa911043945949e07442ec90305e77693861af5f7b957e4423dcba7cc85edd3df830a9e78a6f1ab9ca3";
+      sha512 = "6559e40814619edd5c943e0dea738c8237adce53483640d7b9a946ffb0c5050c9e0909009c83af5ca0c3163e15c876cfe1b28b2dcbe5409061bd4644ee31495d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/da/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/da/thunderbird-68.4.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "fd27ecbff4558d1447288aeacb55d64f71a92da5f53ba6281390a14709f351639639b145653fc03f9acec508f152bd5e9a951ddb000da84c31e1f79800d89ea1";
+      sha512 = "570aeb036129543af13be385d3be6efd30b22fa34af650b8fb0770d48c6537cb44613c33535e2efafad89a0c632e7acbeb569658f515f4910daecbf2212c960a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/de/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/de/thunderbird-68.4.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "4f26fa42f44a17555d538102c07a144aaec6ebf7ab601433a41f7c770b4d961020f4681dd4ad6d14424d9e3f8d23afe78f346ef8e5d163df688a6718ee57e847";
+      sha512 = "e48e9b6652016693338555104866b9c155ad8919f1d48ed7dac3ee6fa1ca4e484403a3d77f17b7b2a862e2590e41a043de94a097ef9e4faade63b063291f344d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/dsb/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/dsb/thunderbird-68.4.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "216a146ebe785e59f52bda1ba7213064069f3c66e92cf59c2ba0037b7bdfc53a95633ef7e445d4cc77b1865341590b69825e0bc7f1d286bd623a8edc70d6981f";
+      sha512 = "135c321f899b2a8fd75fbe15f589ec618911252cf66a004c3c3aeb5d98fcc65754e38a9dbdbaa914418e2bc3175603d04713269c0b22a54e5b70ad6402253cee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/el/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/el/thunderbird-68.4.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "14c1a55769c79c145a2055ba5f5487588241a10a3dffc0eaf556d42f296279602d3a512000142fbd44172e8d65da53a82d6418efe7b8f529cc92287d19e104a1";
+      sha512 = "896251287bb17eea6681313c5f15b2babb108d760b2a09b09ce3d3507177054e9e2479bbcfe5afc4016de36018f8c7d25e5147a4a214f855c16e602fc386c664";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/en-GB/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-GB/thunderbird-68.4.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "0be021b878ab35f1e07b8512dc7f9c9125e192a804a19ced065e4a110a36d412b4f636167f5685f3afbffcc3edb842f732783cdb860778bb2b6a72f2ca313ef6";
+      sha512 = "b4fec6505a563c8730f113a29b4893890c798d2427672f8d10d588c9bd4ec5a97e7438ce27d53d93f7b043f90485055b04f4b1be792db552561864cf1600ec56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/en-US/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-US/thunderbird-68.4.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "6ed7dab93bc18edaddf0ffb0dfd868f20a6a6aab1ef687ef54b814647514804492afd680cdcb6b3445c2a5b85032455800d822ddedda1e1c94b70be05b1ee029";
+      sha512 = "e5643659593e404d2317f3620d2c2b48bc45ffc4d707b02243e342f28ce1b81260ab7b05541ecea47e03583d8b6968c964c16dbf36fc1fb10a4e00b235c55318";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/es-AR/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-AR/thunderbird-68.4.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "10250bbb0eaf6294c68d11fd04a3e5c970d95f3bcee6dc408ef1a0d2ec856ff558b0b29aa29919858853837e541075429cc463d70254906b358ad762d704d209";
+      sha512 = "102acc6c5d5178f3f8e2f39cff5e5f9e1ecbaa4c62d4311277fe06b123c2d9b8270d423bfd68d6e9d86e666f219ef1ddfebd439e85ae53340589fe6e41439bdf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/es-ES/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-ES/thunderbird-68.4.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "6a0dbaf61edccc495e5eb926d0984be6a2f13e81c0cafee48d55890bcbb7a0e3aebdbcac910578869768f49ec6f1c54da7875c2a2c6830cab173ff7ded776417";
+      sha512 = "302c83a0726cb3893a8eab156c1613bb9722c340633e3201e259c619c53066318cb57b751be9dcbe9788b52d901b0c605584211e183d9fcb62edd340d87a23f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/et/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/et/thunderbird-68.4.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "50688462e79588678fc5b9e2dc9277f8a437ffab0fcb195aecb955b5c2d10a0e36b111269d3aee059551fec53b7f1b33b5df3ce626aee550894299d6f8164b32";
+      sha512 = "d8d2b1bd1214b2ff4641e53edd3d6ef662cd9e7bf116cb8c8ff468a9ec179f7a83a7489cb756271c82e36201e082bd2da5d804ebb26fd1019a299f3afcad3d60";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/eu/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/eu/thunderbird-68.4.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e632548c58c7f34ce582e859a9989bf0b308c507f53d3a8d9549c6296eabd62b2bd544a8c23f4193ea02e37b954f6ed1fa5e02ac3a84193a3619fa313a994fff";
+      sha512 = "94bdea45e3693d404cf97e93bdfe46a4593efd6fe0a5fc0bac78ea047cd58f7998140350730706ccc05db2a105414e44e473a472ff9f57a170895dab81a62e90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/fi/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fi/thunderbird-68.4.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f11c0cbb9c65e685de4d4af2760d7bf551883e9aec930b9f6800b3c1c6644baed33f2540cef7efa3dbea5f96bd3864e21f7fadc0eb14c983f9979bf236053765";
+      sha512 = "f1071ca2ae7e6d03880a96dd968ee993b99e2c34c904392d5a0757b53deefd7c15c4cd643679a232de2e404999d1e5c990b052ef0f598c57d8f099cb1b1c9cbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/fr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fr/thunderbird-68.4.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "3665342745eb89ca12eb940c707fd2327e501905f2baa9782b606fca6b24b6de1b0dc357b73a04866f9246049b85165ca35f1656c166f22247bf1e3cd1ad40fc";
+      sha512 = "b7b051a5b4cb139de840b33240f1f8ddb25703d8dbfc66f0a028a2b26f0f6eea5d594e740018aaa093d68ac7bc648ce983a996ad4feee398854aeb160f9fc316";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/fy-NL/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fy-NL/thunderbird-68.4.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "c50e250ed5fce964c2e4dbaf4b34630da6ef124ba17d129e26969fbd41662b9275b56155e15aa62cfa783553ebe5622395502392f125174edd99ae44fa6947a2";
+      sha512 = "a967b9ecdf596e603fb56dd50b20853bfdebc57aec69a0b6abebc0bcb2c9ab62e1890517bf70205749980a37835bc711fcda9ccb6d60f6e6d467fc28c7ef1475";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ga-IE/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ga-IE/thunderbird-68.4.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ce7bde7edd9f7e59ea88a0ed43cc66a0efd1b775156d4e55eb9e5b385199fbe2fb951fc183cbe4ca23af2fa796cb1668a6ad8e97b521ab9e6c3eeb9009836692";
+      sha512 = "7c09306024ea7147c68a9279fc391ce7cdcfe49d4fe60650bdce3fa2a5233623934f7c1f8877feda8388f24b1b1eebeeb2c006265d973cc83339b1220f61e8a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/gd/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gd/thunderbird-68.4.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "186bbe055a542d12f4cd6014e1f405f0f1073343bbf2e4d506eac8d3f504bab5d2d75e17ad7d3ef781be5edd4518d0a27e10c22e08f9a73d94928821104cb398";
+      sha512 = "d820ff2c6bf09aa3dc19c8c679197f207cac505c5e2e5cacfcd5873d4607593d2efe15cf2483f62eda18bc8f7150c4f0f039a80ead07548aa69e5458b6c487df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/gl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gl/thunderbird-68.4.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "805c96343b4baf9aa976fe0d5118e5a90f8d16cfcf05f104772b06f8c92081b1e04a9a9d54a0631880f75d287bfaa2e6862041eac1bb0089b69518e2bf0bc186";
+      sha512 = "e193400689f5d3ecf4a72ee138355dad2c719120e9780be7406dca617faffc750107c8642e35719565f124fdba7a39fac9aed79fbd8923389f14dec54e128d11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/he/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/he/thunderbird-68.4.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5c983349f0885df5070a8df78e5f1db373ef1193f623a6c098b1f6cf642d5ffd219d69f6e6e030d00990c96a36e8efde5cb0fe193dad54b97ca130c31b687111";
+      sha512 = "20098de7a90c1d783466a56a7ea6946153729274c4b8d8663b42f957c7c6da4e2d3465293fe1f33ee884de41bb4e2d0ae83d67b4dd06d5afd09d09c732805c3c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/hr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hr/thunderbird-68.4.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c49ec082c7b1cd50331af3e58ea370426b462f5f846743e0132e24cd8f6cfbe793eac2096e03cdbbb5bcad57cb33a6506c26423a3ac22c2521b08df0a21ba157";
+      sha512 = "df359b429f9a9e7954391e3f64b056d0f6c0fbeb8ba7b024d71f7d211594496fe5aa2f3d3ef56bb1e048ce928dc6da77b1ded84cce0904f5fafc6d3d22bfeff1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/hsb/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hsb/thunderbird-68.4.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "93048c7c93dc49ed90d5eee7cb592fafc5218c022a307a0cc43fbc338e8fb5cda60aabfde0dd575dcf34fa5f4196b1dcbe21f60e2e8d40ed783544cec28da63c";
+      sha512 = "a0bdff2fc50ef13742098eb43e4c627cadbf363026ae9c6d49b3e3c4a48bc747739344fa90030a4fddb5843a4e6fc5f39b6c862e745dab31d41ab4b22e4d35fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/hu/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hu/thunderbird-68.4.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "8fa08673b0c9cf4c9ccb0ed4d3f27cd53e1ddd1a8f02b59bd723801dbfcc687ffaa5492ffbd5f14ecbd8f8446bc6e4979c630f56abd31d01fe1e28d2098c1456";
+      sha512 = "a4d0106ecf554b8b18cab2e417e5ca5d4a3384c6f1f87b8f8cefba3c3addb60dedbbd3bdc5268c6d20fdf4e6bc2c06f17a6baf266cc3b7356e885339cf7ee711";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/hy-AM/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hy-AM/thunderbird-68.4.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7723cef7a5fe2cf9d4db979ca5ec76b4d331ec6d0405f2d1715593fc1305e93b04f8a717b7adaf951d65e964d80d5e1374b9843b73a9b8e1046759ff1b77a166";
+      sha512 = "9038e461596d473905a8390aa9967ef8e6bb013e85258294374bbf910f31d1a1e7fe582886c280add6071d856c484599bc8571bd21f02a63cd313605b1c35325";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/id/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/id/thunderbird-68.4.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "078a8717b522d48ff1a88093c5a6d8a53e17a0e42bc9c7d4e94279b76db6ff3c9123c28846b54f5a5c5b053d5bcb31692aa025de589356672b8e376bca1d1e8c";
+      sha512 = "9507df025dc4bcfe5ef11c929b9ce7d3b5e4b8459f7aeb1a2c30bb50b8e987bb016b8750bf8399720b1cf3bad54eb330c88e990438494f0557ee63a9e4077742";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/is/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/is/thunderbird-68.4.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d83793d09ae302c8bf3e324e04a96f99b987271edf45168140bb8ff95170fffba2cfe07deb9f276544714523e8808719c5fea31088f5d1dd970366636c55ef08";
+      sha512 = "448696428b3c5f39c845ac82c0c4ff2079dca1ce19639e4403571bf9723074f3f9fdac533f36ff3fbb852931a49a2def2bd727c93dfcf70809c1d8caa1ab46b9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/it/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/it/thunderbird-68.4.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "2ed4a70f08134c85926eb0b65229e339c37571134f08da9fbebaea05af300fea57dc7a1c1093044234c5f479c4de678f0b9c7d186daf19c5ec45f10c3ddc99e0";
+      sha512 = "3948b06ffb8749ebcb444de60fff6f713ab72a859d0804a56310ec4ec3951ef6ae6309403e454051147404015fd22deb3fa7d5f6e82ae69018fca55562a583e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ja/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ja/thunderbird-68.4.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "34c0173b92236f77c0a2a8f41c9834dfa8bc321cc8b0c1a504491b1b8cb9a47a7523ede564c3f321cb03c9b096f5ddd6fc20652819864e352bab2dd25cee95b2";
+      sha512 = "fba5fdf22fb3154cfd052e7a7883fc4fe593c49a166e6b088fb1d15acf07edbdff0fc8b8622018c05036cade7048a2cc8ba438c4cf44fd308e62d3634a144618";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ka/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ka/thunderbird-68.4.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8a04ff7789b959a91391a3d2072cca837e4c44a7c11ba159c19c1b108c85a778b508318bd265c92fc4ffa08b0c2f9f7193fe4b0d4b1b9c415fbe9757b1b12313";
+      sha512 = "8da3bed471a03eb8634d804d06cb6ed631212e168ecbce76c4147b40d082434d658a48a2df5dd2b84fc1361ca83a58ecbd8edc913e63a12828a90d87142965d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/kab/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kab/thunderbird-68.4.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d32cd8f125ed328cd2b4447b1dbb7402ee800b6a3ef3f377ffe128d7970f2b2cb34e7a884766d96eb7852d50b8e557ee383f5759c75c2eff3838be8235e8c1ee";
+      sha512 = "cc190d979f8a01f95f02b9fbb8dd0433b14427c724f0ccd95b213a18fc5c46edd91363971b4cf5919f965fa012316667fba24e821929741c9a4fcc82fe62f8fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/kk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kk/thunderbird-68.4.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ea0ac89a156c25b041585313151b9189ea9d43a836d330ee9fe14d02a9015c0b8577e235c485e3ab68e1d60bedd8b90bc37f54d974efba0807de3198820d2016";
+      sha512 = "426f0b90e951b8377088e83b6c32b0c500134b2bae56938fd2f1c44ee652ddb1d6356cea48e52e7c9f88ad0184aa8deaa0141f21ae227ae876bddf1eb1814aac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ko/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ko/thunderbird-68.4.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5ab48c546715a5f93eb055845f57dec25b65a49b21f7da0f2332a78e180e4f2d59d31067cf0869161b23d1fadd5bb887068d1585e33939bbd7ed1f40e2413ccc";
+      sha512 = "6dfc70115784b79adb6ea4fa1f1854fae15b961fd310c55efc67eba03b65057776a163fdf45043c142126ba67fd1212f5ed46a0acaca061fee74ad7e5b905b85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/lt/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/lt/thunderbird-68.4.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8131909669ad64671c959a00c80aef7630c28a74266f10af2876924160c4c990c581a163182ca8a0aa37b55b14f06c3070f88b3e08347e1ded8b231248d058da";
+      sha512 = "a2bcac9f00ac050b3526d59a75f5943b5874929df195ad2fbae984b38c637c2b186528e2926b66fe13fead86ff19efd508a969b18fbe5898bf6a95005ffe782d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ms/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ms/thunderbird-68.4.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "5c4da731f3a71c05e576abfe08504018ff4902672522c5c4f02d2f5a53a37d306cf78d068ed828951ba4fb01713c7dd79e9883e0d0657e6e1c9e586b4b0b70c3";
+      sha512 = "8692a23434d0b0f833346b23bcda716be2c14800fe26892ae6ad8c01a01b4574174ad11a61940b3b8f13c88b4fc890d7992c32e0081d7afb0a290babe32fdf85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/nb-NO/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nb-NO/thunderbird-68.4.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bf3e7e9f8e8e1ca19fdd8a12aa4d20855a888c5afe209171d7c44798fe750ccff07c0aa87dbfe728d8af2f6427c0a2f0b1091fb9acc3beba2b778b6f51dd4370";
+      sha512 = "b415dbd4ec148544d800c86c39cc8006591770aa34bc9dd341bada216abbec2118dc672ad78aa0f9e628937ae996bd79a2ec1c8d7e11cb43182bd0d98b2ec8d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/nl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nl/thunderbird-68.4.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "257cfa13c5f560264a1598b1309b48bdc0b1df00578bbf2539d94aad7592e3ba050a4240dcf918d760b655de6731e2e4a73327b4973db7c7f424f7442a951b38";
+      sha512 = "c51b1665262313140898ad3e46adb56a566a454b5f39e6afd56c5681bf55cfbc8838d6c16fe1a04f555ddfe0f166f275f2bfafb7e2f9452ef082f1e0238d431b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/nn-NO/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nn-NO/thunderbird-68.4.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "f5fd02be5625748c6b3c7e11b698766e43ee620d6865973a4418542dd092b32c1afb4d7e0963ccbd8a6df967a1467eb1ecaaa33df3e77768370dc6a353e69ceb";
+      sha512 = "6c4a13b6f2f8540c0411db998fce53e346e28b89ffdda42d9f1b0cf214cacca7ee93de8a9c5eac056a609ecb108e3cd46260821597d4b89e5bc76c5f961ce982";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/pl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pl/thunderbird-68.4.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "b26167c5b4ef8cb82716903cd81e15ca97ff3641198226b9b9b8dde076e72b665fc44cb30e32c097a9e9f22b0f02e387328b0c5f710309c7902be3b2e625074b";
+      sha512 = "b44c28d828171c6cb8c783606d8aa311c4234f623533fc2072b78a7435b261ae444297e8d01abca28a5a952a5f7dff380f250a11ce4a357bf3e0cc294d2c47db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/pt-BR/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-BR/thunderbird-68.4.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f91b5a3c6af2b4c24cfc11a24e0be01401d58a6da3328ae34f3febd18255ef8b0b18d2d29543bfa12238db7acf80cf11c1ef45cc5b57dbdf0b90fcab8691d619";
+      sha512 = "77e8efb89679f744891c419bdc6ee649d379c023ce181448b84da88c8fb9ae780eb762a01f547d6b662a59c8d5fb172d4b5582e6eba45d8e3c2927667e3c2141";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/pt-PT/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-PT/thunderbird-68.4.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d768759d48b2eee88c865f815d093763ca6c858dc547b230e019703e9e2fdbf5704921270abb840fc4bb3b7011e4df1b51cb699086a29f8e74e85f0dc1dd3927";
+      sha512 = "5e2ba598257d9c7efc793c2126e6564d8e2b92ff03a3df64d5147fbea199912bec44ae54cb3a878f9ff84921fb403dcdb58d05fbd55730e7c4c9d988ece21250";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/rm/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/rm/thunderbird-68.4.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "6d8e2462e13f2d2ffbcb53755e8e2d9637ec68f8cae60f2790c1ac70c9d8cbe3f4cbd8c34fe94dc1dc1dafe38f03fcc630e420fe07bbffc6cf74543f252b69d2";
+      sha512 = "e00c35d5f354f48491420e75191ca5776e365a46d37c68ff69618d2620be6e203ad2b81a7fc2483e4251a5a9815d5eccb1d12bb60e73d039160e156bab627d70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ro/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ro/thunderbird-68.4.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "88288de7be2b82014028f7bf4943f4574a281ac7dff2ddcc347798e52afc0b02c3a3002fc84919f693590bca11019673dfdd4debcfc5d13facf725a728f7f127";
+      sha512 = "2cdf5dd8acc3a8834bb4f48fc58c6a5ebdddcfd94810d32848b98712b63d11a5e41afffa7555871343c90f817fd75f8bab090db0a0417a4b32e736fb67f0471f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/ru/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ru/thunderbird-68.4.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "29b47a6f71b6542acec6011f65e5db4c348d2eb73a808b99cc9b227a748940056ec2ab852a86a9b328fcd051a5028d62a724ca4a2827752329686bc7eb43218c";
+      sha512 = "6bb10e60e32dea4f809e358ae7be703e368674e74ffcfa27cde2fbb344bc938b8d3a1c4b5a2a966857058cfff4865e0cdb11ed1829c5b53ac97fb79bb60c65e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/si/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/si/thunderbird-68.4.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "ff596437a14541861fceda2d1cb518fa8a85590ee5446de99aeef27684445fdbb594b59baa337c8f5bb3a4dd875bb9c61b31d270cb36b91cf57167e335cad2b6";
+      sha512 = "c6989e4b4ee2f23c7d8a577305c9239c20de8754b46222ff86e0debc31fac8372f9a7b6c49a04742456c5bdd2326024180901070bc1015798f6ac28c17ab06dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/sk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sk/thunderbird-68.4.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "cbe82d119a9f766c358e70f3956f8206b4de9224464805b0eae3b82c5e236b2d5c45a15431eaf326553a097f586449802be9c8fe41b3a34f5df221a65a797038";
+      sha512 = "1001fce0276a38faf011ca3136961fda7f58a7f1b21401c0769443d9b3726ee67e6809732a1f3015b65d9bf2e54edc5a9ced5a65d5fa3dc556972d05340162af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/sl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sl/thunderbird-68.4.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "4330e74544c1a87aa186d326ba6a9042ec55281b3e677597e0f27cf1cbf904b9acefe909683462f4c1fa19fcd9673be77f1a29dadd890b3aa3d2db59f44fba3a";
+      sha512 = "3179e9cb041080a0be5248c7454fbf5f26f939aed8ba79ea4552f2873731b7c8f371c066c34564b614b86be77918d234c4386de7a6fb7ad4960f416788d5d10e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/sq/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sq/thunderbird-68.4.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a342ca7abd003d442d4f8890b6af60529d9f6de1c6ad0b81358b7542814a8d8abcd82919eb48863ef0ef31cf8a65db028b2d305fb3c4e158d8b99bfb8336b0d8";
+      sha512 = "07fb5ba6aced0ce735144c6bcdf81a154ffdf1f56ca8ac6299a64d170c6a4c1308b92e7829fa402586ea8232ebdaa078d2438136aeebe585f374f43560e51553";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/sr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sr/thunderbird-68.4.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "46ce55cd819a3dbc0931ed4b917538a60d6a50e4550a200540fc68572a909b48b9f9eb79e1209e0345a1e8c869299de76f808851fbd1899c2da5e3a1853633ce";
+      sha512 = "5c77c8a00dcff96f4c59be212a118bbe427bb8a418d904d6e24f81f30add2f1cf6987f4b7b78660c9eaf636101518646c78d0addc93f9b8409b58a3d5fc8ca1c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/sv-SE/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sv-SE/thunderbird-68.4.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "567f6cf145e9baf4522eb043d41edb4b49d7b31f08825d89a95ae3bc4a3d25864e17d52bf0644ba6d289e2d75f1ee029ecb83b7ee1b18426e2cd501990a4404d";
+      sha512 = "32c0be98bdd1392fdf42eb7d84ee5927b57ab0a1af8600349b2e51627e0b4fa4cf1f9782e4d16041d7c465a3126a18a11fc60dc15b214ee8c11babe9b3ab9c33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/tr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/tr/thunderbird-68.4.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "18f0fdaaca7100deec6d43510812c26b8c0fd2ea346b0a706ee2296e621951c9af19e1a9c06e4284d2e29bbd26c34209247c8cb89b91aab0b9bde66c0e8523d0";
+      sha512 = "7c143cc6e9cfdfa0d2db25ae37dc7878f97f193f3b611d07d343738c3dc61af1e09a4718391173c85df08365f9733666ca7b3711df2e8155aab8f960e1642bc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/uk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uk/thunderbird-68.4.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "ffca4701b85b2b054525fa919de89d149979e63e6402c9a27ef3bc6d4d6b8d06d8585d91e97f8c63d7e9e0e2896d9e5f503df50ef7cbec07c275b046c975b01d";
+      sha512 = "db7b6115a26c6488f0019da6d7b8b944d415accbccc96b6ae475a06a35b610e4bea0474c89b6b618b2257b224beb0442fc96d40a2650da05970af94c2ac32d78";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/uz/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uz/thunderbird-68.4.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f2404910418caab9bf2321415e139afff1108ee541dd124a44bba496bb6a7656ff1045c1c587e60749bb7c406a31be35d61540790716a256f63e18ac14e4d548";
+      sha512 = "bbbeb6f795439c0dcbc518c682bd22e76579313b6616edbd245d41459f6130a36d562d159fbaada3091cd4a0617efd2a787da147d79b8ee65dc4f14cdb9a3632";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/vi/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/vi/thunderbird-68.4.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "f4ad335a0a7b005503b04c9b09cca4eeefc820d04101df9a3cb592dea471f0d2077a1ba580af994c52822fcf24fe6695e0e8822a8fdf5442273fda23d809e95d";
+      sha512 = "fc171feca694a222b8c18cbc56279a467e006e12a2bae9d342543ea110a4f3d6942ebe826aedcc1ee1b0820572b938cf56a7248c946b55376955bdab76d5f0e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/zh-CN/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-CN/thunderbird-68.4.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e1bb89465dcfb93c86f159b41b5853789c48307ee2302bb2a95433137685758d14258b195db322e5466d0eb465ec0880f4a5f97cce4e4491addeb04151624401";
+      sha512 = "ffe6cedf7ab39695473274eb0a56bdb4264f3236b82377de57de9d17536353fbd9d311492aa5c3f91fecc007cc7f70a37611e52e44aa29b324af265a4f42b0e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-x86_64/zh-TW/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-TW/thunderbird-68.4.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2d843743fe521d95a45f63809527c88def0a952d55a66f105e2770945e190d0e23f58fc20d6c0a22b7489c158edf60f4492511e6adfec0abfb06acdaf21da5f7";
+      sha512 = "2c463698c7c540a6c0b87feaf12afea2a053157268a9e9a50b8cf222fb7b60ed4b2b8338da9d5ff6504d78b13e644020f82f9e45cdbe60f2d022bd8301ebbb31";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ar/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ar/thunderbird-68.4.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "68b9a6e9e061658de00d70c04be84c7af9ac37338c37f0b4fb293906fbcd4908c9065172db11fd55ca4e3a9e677e26763919447ec7d5ea007302cb3860d3a367";
+      sha512 = "40e5955aa4cf8816f9b1f6b0b35b2a2a315c64165dbecff1a5467c59b1eba773becaa6e36369b984e133b3f24b26b95ff30b586172a187ceb63341bb1b88310c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ast/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ast/thunderbird-68.4.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "6ae4d6a528ca473975718738ddb28c84603a02f6f9975e263ad5420e45082cddf1895a4d4286a5d7bdfc546a59c93e50f699601b9e1731b0f8918879dff19369";
+      sha512 = "c9fa685b0545b4344867590504765e5bab29efcb1f4535b5955955a0454e67d48b8cec3f806b016389640e49849e6e45f49605680d80ae68d5a49da25aa6eb17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/be/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/be/thunderbird-68.4.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7342663e002b37eb4b3cbfaf69a6611798172495b497e311610edfd9613ae79a8764851361163c0e4b7ec725b34a57867f90d850c96817f23ed8756552f41130";
+      sha512 = "582cb49b43c878bff242e46efe8bcee8798c19ddf69021c5e27b7ff874a64004643c01be06083426968d3e0a690c095ef902fa8f89959bcddd88e76a11e1a00e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/bg/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/bg/thunderbird-68.4.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "44e91353626a4306384f36f8b01d08344775f05e0fbae8cb7db444f05adae6d90bfff0f38406286da715eda868f85eff48f42c118f8cc00e976227eac666d4d6";
+      sha512 = "6cd97d683813e413fc57bcfd0edeb36fc6679474f7459b9a83156d546c2841d9947d9ea2304a1f02bc97a7dd030657a706756ab0e07f0ef0545a0d63c671b080";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/br/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/br/thunderbird-68.4.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "8d33303debc075e838f33e1de488f42a4859c93747d8dfab6735f88627dc38189adfec69b4c61c25863a47f04b60a3068d1b4460d0e052566cdf45cdfea3d76d";
+      sha512 = "d1c604a702bfe245de5b8b577081677a643828eeee377da3c630e886ba7e71d513e012064ba426104d73943596ff7a551af982c0513d44b2e80f5b3ec7ae1b67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ca/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ca/thunderbird-68.4.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f3a8c39ff394fd8826422bb2e8d48f32e52a0ac8c12c76d7a7954c5e7383c86f4f701bb72aa562a547c0a4f0928e587e29373e8bd5f0e100240ee10e1a3ae4cc";
+      sha512 = "900608dc77fd43f7a4a8a08e7bedfdd0ad9fea6df3cc2a23697141a0240c3a186103c9f91dc730e8d79462413d3449cee14f64f73b54b563ef20daca99f4aec1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/cak/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cak/thunderbird-68.4.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c85a3dacde46c851340f54bda5e83fa8be622e222c2673a12d20231aed25c1ad6257e223ffaff29d8608203b3a7556e9f660bbf994b7b74a837f5b30a0bdd6b1";
+      sha512 = "fc58f312b7da60f8234bd7c53b22ba3835664fb187c66d556c32dbeabf30550ab612c89c36b86ea7eee6b4bbc03b6750b5fd35173115a85f90af417c09b1e54b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/cs/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cs/thunderbird-68.4.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "12c07a5f4a22d4f6e489de25cf9f7414ca6dd043dda4593d72795b7208f2a2c7862fa723f134d0efa2459851c84ea2e5f3dc10fcac90b392a63e4e35855fa300";
+      sha512 = "5262f6f39b7001eb921f405fc665bf13507b9dac57d3dc30fcfa2379442937bcdb0a693821d09a36585047b394e719217f4eb923ff386782276bf0786d35d078";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/cy/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cy/thunderbird-68.4.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "5b05338a12846fe5fbe84616b995ede82b90a1d3b9a1b5fdc90f5c0b54540472157d485648349265fe8bf00d9fee169113d2906b32b3f117b868ce5bd18e7c40";
+      sha512 = "ab29ef67b069b97c53dffe8b444fa2ae0b49aa894ef072a5bc95f43e2cbb1fa2bf2c84d0a734445d9af27fafcc50efc7a96c95d43cd01cc1c23433a748d48a16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/da/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/da/thunderbird-68.4.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0b4507f9bc7ddd0a24f2e5f01e8e9dde3322a5da0d17d587373c3f5363c77768425e1e96c8f03bce9ef8d9f2763702d2d61f2bb6697134f5c0449258259c2f2e";
+      sha512 = "d4b0e640bc98ef085d79244a9a3120d55b39c621aadb0aed3973fa97baec0db11f906b2a08b88b98b114bb28831c77fea9e20a93ed9a3ae66f910a3425c553ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/de/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/de/thunderbird-68.4.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "888f1fd74476d48ec063a42567a47be77c794658e51362e00d025473928c898f3acd5526e7ddbdfc64e7abb271914fc608be28b22cab84c122dd5d5849f70284";
+      sha512 = "bc82a9c40bb551852db0829dea239a133d78287e47edbd31df6053c36336f0a483f608deb5e095654e37cd9ecc234f9007ccb46cf08ba45f5e53335c040f4bda";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/dsb/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/dsb/thunderbird-68.4.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "cf307ced47f3c6e1d2b3f577fc2d30d1f373d5e8c2c0003d6a121bdd762105b720b02568e0df67f0b150632588ae2079f8777ccb9a549a1326f0563b3db45808";
+      sha512 = "63bc8569d8c4c7c77933838b53d58b23da35692d6e64229742abe78593e8bc26d21d81d275f2c2ac4531c498143c756768a1d2e830ed3ceb0586739fa1aabdc0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/el/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/el/thunderbird-68.4.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "21554fa64b56c2375688df0a33b9a9f77a602c2516680157719c5665029f5f9c731ad29738dd563a09168494035094acc51a6456533678f596cd91c3c1635e20";
+      sha512 = "f41852a1ebf44ee534c43ceb054613775d33391563460fbf97f8fcd01a530d8738d5199690ff8aee48840b2ac5d2b79335ea4262c575441aacffb8ae54034c8d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/en-GB/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-GB/thunderbird-68.4.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "204fda2ca790e8de65ea6c673b711886ccdc43ff17233a6784afe81d497177802da86e1ecbe692a48ba0f400fedc9b6d300738b12f73461f9ad86c07b302abe5";
+      sha512 = "9324413cfbaf370b69d1addbdce63f8fac8668fb0354533b48993b78116c4b531f8bc73291b8764440d47808a582f8bdce64b3147660b8130392b14010895323";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/en-US/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-US/thunderbird-68.4.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "4e3b5cb47677550812a7b3db0155965bceb1cd23d4847612c59b2d58d3f8bd3ec0ac38218685c40725911c80fd295b2a7ec17973b7905693bdcc75a460af10c4";
+      sha512 = "163b78b9333435abf8bd0efc60451076b304269e13d95cc5ca3566d2fbde178317d6c66619353ab3576e8411e0752d1157400e3f0857d7dee8279877585ba5f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/es-AR/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-AR/thunderbird-68.4.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "de182f8dc4a20742e722bc06b8aefa85dbb375c6ef75fb237d919070156e7880d4f5c0911da3aef83c8b0759f5a24e71122252732260e263457dcc32d81771d6";
+      sha512 = "4a96f59e3d9d3ee8675a4346a0997ff0170cb8202bbefcf60d1bf57f491eafbea5e56510310560f5e94688bede7e1767d9423b95f10724e42c3ef5cd49d54c7a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/es-ES/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-ES/thunderbird-68.4.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "52d6245744fb72bc6f0a1ff9e701232b675681687608b50cfbb0df759c9be006c90524a0814cdb5636f11a7469acef9c18bc63e3d0f543ec13b2afb23980f691";
+      sha512 = "f7eaae51d0b8f0573e73eb434ebd1ac8f1b65421ad0b50a9f59fc4f329efec11aef40e8914ed4b97bdd9189bcc14777cdf6718b2c677515e4463804166460670";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/et/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/et/thunderbird-68.4.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "38ed3da3b66ee271d8f3b9cbbcf2f5600800681037f18457177594f7fd42489a16e081deb69414f80a4a094aa4e0c88fdff18dc49e9c0f430f93ec406bf0e7c1";
+      sha512 = "e0489ddc529f1d898c373667e8abfa1e1443d2816e7981660310538b6433ac8ce108eb154541d390db59810b3cdfa43ab599f2aecdd7723c15c9410751542a48";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/eu/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/eu/thunderbird-68.4.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d8c23496f992aa4993e2552f086deda0dca44931bee1487b75794aae3c8dc92309f373c10ca261c7f889190da379daa3824bce668acfdd088bf134a4d7623041";
+      sha512 = "c36cf8f192319c7bce325d7c2f382e291863d9c4380afe776adb914e85fcbf74f09469f8a0e7880f2b7bc75897870245c0617fb92c811325b115a1269bf2ac5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/fi/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fi/thunderbird-68.4.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d5261c3ea48b2d1f7023510ba054a2192227b188c6f67cec2d78694091c0e580d2cfcf1592684a046d78a3f6b52ed4fcc177f1ffd6189c922a899ac6def9f681";
+      sha512 = "acc72ed030d25404508d1f1cc1adaca4f5e202144effa5f8fa3d45aff72c534ab001d6f973dd9f8ff87b03ade9cbfe862d9b611dae6797ac1a0ee3c765ce86c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/fr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fr/thunderbird-68.4.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1c86570fda779c403ebddb7fdbb3663c73748f298cf8b41345f442cd93fb98e30f35a57f8e0d859445472f17f66093b9d89e758ef60acfdba13bc95c94199a3b";
+      sha512 = "b953148ef8402effc648843b6496986889e35595c5def7aa7c6e563a73f79bed65bad28569aaa2ea73afbe0ce3476d8a7f7fea7f547c13ef39bdb8e75c37ca87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/fy-NL/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fy-NL/thunderbird-68.4.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "a51a2d722a18de21062b067ab8ab78fad29c3ea13e88d1183e3687628384c576312411fa38f4dbbac05d240acece18efb74c064be4115c0ef6d57ce6e377b48e";
+      sha512 = "d361f67487163acb0e6be8729777e7c37678287e5edd5303ee300f36bfcb62b2bb709c5a4677135ef347f6864985a9d4f9a7b986a7e0ce2987d2f650748b13e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ga-IE/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ga-IE/thunderbird-68.4.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "739f32390357cdc21d2e10dfcc4e088dfb761125469d19c2cd64a8130f9ead48f28d6f3bac29b19ebbbe1ac05721a8baef9445173adc8514edcd9e5b3ab82b96";
+      sha512 = "5c2e87a6770cd71002e4d7518e23bbc6a2c498ea53487088a0015f8382b3348d170e44731fc3a6c05de585531f05db971c70a7fdb4dae64e8a7cc37da8487353";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/gd/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gd/thunderbird-68.4.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "310d976e94ef5847e121e8220363cc7834de6f15b8d525ab627d95d2c6e661eab0cb4abd72bc8b66a7c58d877f1de3345e20d1daa3618949be6d127178ff0987";
+      sha512 = "adf0cb3660d024853a683b2ba76a40db53e9ddefa0c8faaa250c30bf0ba4235981bf33a34e538b0a68a466645280824f51904ff2365994c8bb81493f42d5199f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/gl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gl/thunderbird-68.4.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "151b500d02c95f90b382c26dd40c18bb5987b6089ff3d8dcde571357b7aa77dc68bca80243fb7ec0ab95714bd90b3294ba56afe0cc7bc96a156e4fd753afadce";
+      sha512 = "0f34e45513ee591a303fcb3478518b66a58782e93dcf7ae717a24947cb7280e29631050aaaaaa388c9908fef9abf51f50c2d5f624375c762dd5eb76b5cabe45f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/he/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/he/thunderbird-68.4.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "8f543d27c40790856b1d0e1b2c5f7721940c2a3145b0f24b4ff32fb2435c576ee068852e77d64a4405f025d116ea61d1e151c1f462b605a737a96b4547358dae";
+      sha512 = "1cf9cecce376aa8b1858546ff41418c26c126b00ce8d78eed82ce1504119173e8b2205fd27df7753b41d2fcffa9137bf8d89d79d74c106119be1ec7758aca115";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/hr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hr/thunderbird-68.4.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "87e97b914e3e157c18d276f41d7b3a0e6f2d5fcb94aa061613ddafa27555c9915992da8b380f4b3752591f8a4be909470df050b3ea7fd212a02f28daf1b1ce68";
+      sha512 = "3840bf39881b0ca61c37ff81cd5bd3e26ee9e033979e6ae3293c56bf08e328bae598de56abd54a75ca5f2f9af577b766066177108fb654b99410a4850dac8c84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/hsb/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hsb/thunderbird-68.4.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "9309d6858e66bb588dee839f90e4ffe00f65d57e8168a3d0f8fde9423d4becc6bcdec8263f79b4dbf062e04daa3f6b44d69cbab2abb9b20f53a3d3029273e910";
+      sha512 = "4c6fe533a358f1a49754dee7a7d0185f4c8595f92b3458db52511d29f0c24f5af4c4e9578394d337852c82f1d2c7be27240ef7b630462fd111c1e81fc52b5cc0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/hu/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hu/thunderbird-68.4.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "e53c67f216adb73cd7440eedf4dda77e14fdbad74dea5af16446a006fdd561abf2a53b58168e17ac5800b80c7246fc18ea5bf3e4af2ca62311efc7e2329394c5";
+      sha512 = "2077728c1d4978424cc8350fabfea488966c3ecae734ac2a1ec3a328ca05ed6e229f01d07b8c37123edb2b005a4f0ea57be8ce4d8e79269a8f94975d08583fd1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/hy-AM/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hy-AM/thunderbird-68.4.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "7fdd50493af28212534ba9d1cee5524d98d571fef10afe35c7c9e1deb0364139e71d01460f3b608aa8862bcb0c5b6c8b780400d7175afeecd774833f40a17588";
+      sha512 = "893d6c30af0873df0002efb3821bc515de446d785e0bbd03890b1e04033f09845961365666344f1c5a85a8698ee464c454e848296d50b82da5092821e8836751";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/id/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/id/thunderbird-68.4.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "341e9755082e7802f204121b379694c4ba42732163ad1437cbf9220fb98ef1e32b3a0b03efc4e27f944c4e0fb095984abb7e044ff3ba841c83802b8aaec4522d";
+      sha512 = "32709627f0f046ae00a1adbbb99b6bf10f1d2358a8c8fd5a07646a7aa05cd9a89fd20a20b0fb286f28fb65fe87ff7f1ecce7a25fbc93f54ab3ac0712cd99a6e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/is/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/is/thunderbird-68.4.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "7eac8ebc8c3b85eb446908068b0697427c582982dc829802f0694796fb9cd320fea587465dfcd86ec12f8058257430a8a1e99866e92c676b4dea947cc8d96e32";
+      sha512 = "cb6b69787a6258d18733413a91e74071f003e7c920463535f22862d2a381bdfbaee658c19eb5ee6affeabec80bf9c8756d83bce8e3d59528ced62687b61febc6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/it/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/it/thunderbird-68.4.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "85369a72719b2884ece50de9f72d3b86868f2ad2b1205419eaa5ec9b86c6d7e1510a9fcd9a5cca737d59c11a69555b7ed901011d1f9533a32e72499272a0ba71";
+      sha512 = "b4cb0e7fc8cc0f462183ace8b0924e545baa233f97192f62083e323fb50f9156bcafe2a9822371b6b13ff3cdebce78e134cb855524b4b0e7979d6edcd0cac7d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ja/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ja/thunderbird-68.4.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "2b2c699a4a46d8807358850689587d7359ddb5b77715a90487b2b9927d1f4ae31b181f6e49d7c6b357a5a9ad200e6b402f978c530acfe01dc05b695a1e4c26eb";
+      sha512 = "60eda8ddff44d4bad3bdfaf3e8a06b0f77b0a8de151eb76f47e376317b36ad9d240fe04a267fa8a202e56e82a1fb456a9f7954235de3ff8f6a2eb2f4f51f9730";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ka/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ka/thunderbird-68.4.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "e750327a8287a2ea16a086df351dc99d52c53a6c5e9d1a170f69ca038e06a68a72b3a8a19dcda29376322c78189dfa13144716c811c773ccbff4462db06ab402";
+      sha512 = "686318185f32947f60d451d01ccfddb8203997d077080da2bcb79a44eacdc59d688e8cc5c80fd46aab4b31bee7e13d0122fef169874403111186befddd0bdfe3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/kab/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kab/thunderbird-68.4.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5d70d8dd90459bd80acbb8b90c302a5675dfd7d89f227ed475f91beca2fd9d80c92f5ebe4ffeaa3fdc4a95fe2f38f6caef5f98cf16518b50bd3987f281264df9";
+      sha512 = "9c278760cf0707045f02525c9320946d3c844b868550bc434f1bdda27eb52b6cc1d1c719aded4d741eb2a413899cd2c0627194febae09b39fa30a1f8fe56c880";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/kk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kk/thunderbird-68.4.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "5ebbfc301eea0a2710c7b16e72361ca642e2a5ca9accfeb79c44fcf3f0925a4802aa1411801ec71a752a59dd4aecc394f50b1a159d8e6d64e7543cefabb50565";
+      sha512 = "e0ef017074e515d04bddda0d9720723d903f2ebe50c51b14c220adb06e4346fb49e2dab14d91e33099965bd6fd93547fbe591c34539cbb061f74f98a11d85421";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ko/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ko/thunderbird-68.4.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e690be1d8bb5dd37babdbb1a7ec1e088205353bc8274b30ff32e3d5784840dd224d1dc859edb2715cdd415f4179b37bae84933394df91804da05841ba15a3f50";
+      sha512 = "0aa2dcfb8f76250642a2c50dde421e99f881561c05028f7b167eb79226843b51a33cef56ee64b18cc5c4c1231a28b6747adc5aaaad46b228705f8459e5ae9ec5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/lt/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/lt/thunderbird-68.4.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c98661e8718cd91134c9b7568e0e5b4752c7f4bd7e6249e9d7146e833b2877648625d066c529e7425c8ae1c50be6e74b94b978c0da85cefa2a6c09bac4ef3ec3";
+      sha512 = "ef95d5727f64da1013a0de99fae05d49b04cb8a78e9059231e609544106e9c1df45c34188cf879849028de40a35b488d6d00df4c11b81452de0353e5c224e724";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ms/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ms/thunderbird-68.4.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d6a834a0d191a74fae3777036ea42cae6996d30c1ec40bfc389257b6fd665cf7b8043ea7d795186d21910f3e23c229df6b56f5f7c94133cd9851748aa1d85bf9";
+      sha512 = "f3176d9cb1c2c3689fd70b9beb62c54ef8ff794724b57b074fbeac72ba575aa49675cca53960f588da01fddf9921be0b606baab6234ccdd930a9916805b08135";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/nb-NO/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nb-NO/thunderbird-68.4.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "dfe70eac073be1d1fe9ceeae4cda4c34ebadc2d060f270f3cf5e40eea65d25016974e4fc985eef66a76593804a6b21ece8bf0c2a6a7aaaf8a349ee72fc192424";
+      sha512 = "ae78f3dba2009e70c9f9aa2449555ae4d854ffd22d83b9a41df41f62ebc090a255cd3ad60cf47938137625c7c726fd8dcb26f4136dc1732b22d2e3823967ab8f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/nl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nl/thunderbird-68.4.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "053ecc04949cf944dcbd16716652f326eefe9227873a5b3f3dab3e448f6a8b5b77126ff22e1cec417dc93c39fbc635285d88ffd071d7f59ece43988119be287f";
+      sha512 = "8e52c3bedf7715a063e0f94ca9b1b927eeac872917f5b5fbbec90cb4a87b0aa73b28a809fc30f3a99169b2bff4ffb3b85234f5fbf5e97230eb2a099cee775715";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/nn-NO/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nn-NO/thunderbird-68.4.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "7e13ab5a390be2ec38f1c5d2c810fb55de018336d2bd263439bea33c07e5c7d847ba0332f91769104d183b12092cf468a591a90b5b86181ff397521d09d789cb";
+      sha512 = "3c51c7436e4b37d9b8df40543db1506aea856b99e10cb06805da4c3e45fcb67350222c90e5b6ebdeaa0318ac57357872e7d7932f910462466abd70f364bd8b72";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/pl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pl/thunderbird-68.4.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "27b025e7229061bf1ccb882d64f85991b35b171ccd0243d0b6866ab582890466ffa5134a313b1c2a398350ba113df6d1cea49bcde4eee57fb33b2a509e81078c";
+      sha512 = "4996a28f8e7a6dbf351f93339abf3b30a85ee2311db7234c516c8994a90059169538b5c49d789195818ba7449ed308f7c4c7f8d54ce910aa10f0c5103fcbd992";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/pt-BR/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-BR/thunderbird-68.4.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "be57fe7b44e4b3625e0c7b7a9e2fcd665cfddc841f30195f5703744f03c1ed281b3411a806426f22f7f2ac77ae872a734de7a913e07835aff5f18309142c0d9d";
+      sha512 = "03f16be0561a16d943dcbd2fe898839060683a3dc16773647169b8da71d0c2ce235aeeb3021b474b4beb00b41bb56d486bccb870321adfafffe4aa2522d8cf39";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/pt-PT/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-PT/thunderbird-68.4.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ea485265a1070cdca9896a21f5c7516fdb8c26a86b77dd03310add982f1bf4f41db611c40e50f706526ef6d998a49f866976414e9582726b872e5c7b6004d58c";
+      sha512 = "03225c1bc7352c79c457f6be6149bba18b7682bc1e66fd6745613b80701b9138ba3fa4d1016b7cd2a0cb4fb804a9a5329a3768f9c9e53529e9279f64ddb4765c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/rm/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/rm/thunderbird-68.4.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "84e21d7ea2ed047ed84d2b7b31401f665b9faa95e0b5e79002e0ed807537d0825c2109c1fee310b56778f17e6e228335fd82561928243691c9eba878cc9ad6ac";
+      sha512 = "f0d42c9add6b6ca9e3bd768ef56f320f57a8e62eaf0eec8f8d6d544bcf95c3549990940ce5b8b04e91998a012bae20d92f186c1f42273e5f7d1fed8e504ab082";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ro/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ro/thunderbird-68.4.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "95b30884fea975918e99b8d992dc7a30254d8a5d228a79f55aee2c44c30840a5d3d158a5d942eca488ea8e329fd3b66d3fa73cc86b1b3fc41c4d55977295ec53";
+      sha512 = "63bed7e8e38dc7dbc468fd668d8fac6ac8ee4502a035c881fc09176f2868c184712282bb9c3787da07fef0a27af3ec1f01e70f39711f90b4694ecd31be5173dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/ru/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ru/thunderbird-68.4.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "917d824859af02ed9526dce0e9a07c1047e8029fd547bb494ddf7c6830d77b2b5c9a8d6e9acede37f3516a85dbe9cd92d53671d45df997be975b1c3d70e92ee7";
+      sha512 = "0f694746bdfc5e69fb82c57f401bca6b33661205c3cd0d94857d80432711d8396fbee8dfcd91c86022fdb693bbb1d096e5802077b49b98de008cea0c6fadc9cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/si/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/si/thunderbird-68.4.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "04f928050d36109d341055d0b550e2a8da38ce93a7482c36a1fbffe08afc5aad9bc34902c55c20a507ac1ef6a5f1d053d2f39226dd0dcb354d1a32260351d19b";
+      sha512 = "ec2f4ca4a03ade9225307d3a7272cf8ccc6616612c3ac5ccdfa13219d33bb3e7d86dbe724d500b907a450d4a7cc1066cfc13a64e679486f8557016ed17d3f73d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/sk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sk/thunderbird-68.4.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d1052a6b12a2ad8818b378792afc87eac5a3401e916a666950fb85d4dfbb13ed8cc95d987eebf0920f1ddfbe3b45a8c4946a8854a701be1cdfb22fb5345e9260";
+      sha512 = "95e700d67d831f7ebc505ffd699a58641bd5ffd5d0f92ac09472d1fa7f24310c90551821149fde4782357c551487cc8dc999f5e94c8c55e8fbd24508e9c9edaa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/sl/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sl/thunderbird-68.4.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "21f4addb5fe928aae2ff15955bbc59af126a20269dd914c23ae54816a912b1ba98496ffbdf0b2dd51a28eb4357aa3779480be4321b682a410e4404b9c2cedbce";
+      sha512 = "9be4327cf8696a8324c37ae80f0537322c1a2601db32e1a601155a25207b41db8d2b028d8da7b43b97986465b425689474fbb660eda97abf450216d50ae059c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/sq/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sq/thunderbird-68.4.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "eeb9d20a925cbcf1fac9ed66bd50d8e38d7b00e0e06b047c9c5ab6615c3d44ae1543e606473532b65297067f7a524db231233db38e4ca479aa4e03dbf84cba09";
+      sha512 = "bdc02096793ea114f6e44532d6e998fc36ec4ff7df2dc21df1225241cdd24ddf6f4b4d005563f698b53c743b0abf0a6cdc276efac6cff6d4803df2a84f5c61f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/sr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sr/thunderbird-68.4.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3842a4ff4b189a635bcc621fe729ad4912ba44e7248df0d944562aeefc7b99babd74c36b0b5c6a45179f689b4b7bfadf690774a9df4a39a800ebad40116bf58c";
+      sha512 = "a9ffbe1c59b0171fc8ed611f61e923c6f3d260ecac226c122f7d10bd858607b963fd1d89a896db0eb1754c3f75b18cbbe66c579c8da994490e04380c907c8fee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/sv-SE/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sv-SE/thunderbird-68.4.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "251a29759bde407279ecb97b27bb2aeb4f465171cf46614656b3ac82445339dfa4ae5e08a2b0d97f5bfd3ae8ee97b7bec6e910148c572753f89f4e8a70ba7ae3";
+      sha512 = "86f3c1330fd0a7a920d9cb93f6387cdde69873c2b60bb9c71ff8fe3c3c6cb0cede8cb399d16a7d876708c3bf4142ae0188a1a7b0cd2dfa7a271fdee363a4ce4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/tr/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/tr/thunderbird-68.4.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6a34a13b30d94f5b62b14d696db5ecf34a02068a6fe89b3b010b96382d45bb83d0f74eff1e0f81189a33adf65b315ec652e513c47bbcc7eac5be78e87de1557f";
+      sha512 = "4b6086ee5bc0925d790b552d9c812d8bc02e5cb2579cca9cdd94475c4dc3ed390c989b0f9f7b22d119caa64f76f45f8aee06c100a131874d86c03692e6979750";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/uk/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uk/thunderbird-68.4.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f565204f6b1e95578f19baa6cd3b76364898bd8fd73ee2882ddf9deb10cd255de71d643bd042fdc7a7a2c6b7656898aa963750c7ec396967548b5af23b92b9e3";
+      sha512 = "27dccd517995446bff809c74b79900488694d2a999fdba38b39225bc38d212c2c394c0256c6146b9485af67da27c8dfe3a31e7e380e2e07d19abd1a8a086e44d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/uz/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uz/thunderbird-68.4.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "a784d2368e2c5c758b10ce675817161e6127127927e3a9c498875ba58f94c20b394e903a4c5091d545222ddda25a58edcd163d1e23a2b5fb737e17c03eaf60cc";
+      sha512 = "344e0311945f8139be8be3413bbd0106ae4197f78d809ce729634ec888e50ea2153b13ddf14f5680224a5be049080d540a9db93f22c3ef141932ed0b4d769dd0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/vi/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/vi/thunderbird-68.4.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "c0e896c70e1cfc870873b53a05c43b26028635c7e148e138f9e01cca2aec796f2ebc2f256acf9a7dbe18bfac545f6355eeecdb86f99ed3ee48ff36c26c03fc61";
+      sha512 = "b023e8afab96756e67b589d912d27de880fad51b9160645a3320ebd8d1af9a13c036d09fed7dd60bcf57876a93056cfa5f780c505b03bbd2825158e7c65aeb93";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/zh-CN/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-CN/thunderbird-68.4.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d59a40ae6e2d8b4c5350b95b53d0ae1f9a41a6f8d69525ff3865e107c4089a4735d7ab64992f53894ae9c73ea89f0c4e4e69e46150c8cf873436d55258699359";
+      sha512 = "52553bee4e8954ec54b3bc79f02149359d4a96b07a94a7f175abeba1795fc0c92e734631870b141fe4c9d094425d9e555b473bdbc1088a9845bbd49aaaebc181";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.1/linux-i686/zh-TW/thunderbird-68.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-TW/thunderbird-68.4.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ab4d1a3170ec351b64e4ae217f1ec191b791db016c2d614ffb55ce7416888c20e19d235ec274a0c0518cc87980d97bac9379f130a8c82dfcf6f7becc5a0772bc";
+      sha512 = "3f792f3529d85eba88a76b7bb87f207ba3fefc91c7a6447554572c7e2666d19d41a5f65f811a60173a584ecfc192f9a38580a8861bd87cd5bb71adc582c4d825";
     }
     ];
 }

From a5c3e0647b4ac0b17ddc7d3eb4432c7e92502c2e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 25 Jan 2020 03:16:22 +0900
Subject: [PATCH 602/755] thunderbird: 68.4.1 -> 68.4.2

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 39b187876717..2011c35f1a7f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "68.4.1";
+  version = "68.4.2";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "2vhhkknc56gmbpp6vi9g3m5war88n0lp4m55ifcrbqq6b1z2zrckzk8zsia9vzzpaz29cvj5sr8q8w2jw3jhal45qqycwil671cpk0n";
+      "30k0qwg8vb6gj8j8kc198n3v0lzd6bj5khdcdhyw7wrsz0802k2lnai836p9ji5kybf9v8vs5n8g4ml1yl88sxvbg0692ijz8xmkbix";
   };
 
   nativeBuildInputs = [

From 804fbc9c8753faf41e58149ec7c31187b78fe46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 24 Jan 2020 20:14:31 +0100
Subject: [PATCH 603/755] eclipses.plugins.cdt: fix source hash

---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index dea00c99d7e0..87c32c30e190 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -259,7 +259,7 @@ rec {
     src = fetchzip {
       stripRoot = false;
       url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.10/${name}/${name}.zip";
-      sha256 = "0rjm91j0h1aq9lq4sdwgp9b2yp4w9lr13n82z32dw3gz3nby1mvi";
+      sha256 = "11nbrcvgbg9l3cmp3v3y8y0vldzcf6qlpp185a6dzabdcij6gz5m";
     };
 
     meta = with stdenv.lib; {

From e0e2fd849a674379e4fae67aedad1188c9807194 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Fri, 24 Jan 2020 11:32:19 -0800
Subject: [PATCH 604/755] youtube-dl: 2020.01.15 -> 2020.01.24

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 875eccac942f..59fd4fa70c9f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.01.15";
+  version = "2020.01.24";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0dyjc8nxyg9ry2ylmblh3fwavpais3mdfj6ndw4i0yc2vkw12rsm";
+    sha256 = "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 82fbe42206e3618b0e2ca8307b484f291a24be39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 24 Jan 2020 15:19:00 +0100
Subject: [PATCH 605/755] snowman: use Qt mkDerivation

Fixes #78382
For #65399
---
 pkgs/development/tools/analysis/snowman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index f8f2f55c5aa7..2f7ff219081f 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, boost, qtbase }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "snowman";
   version = "0.1.3";
 

From ae09f2a6718591ba2fc34657b1853c8475009c28 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 24 Jan 2020 20:04:07 +0100
Subject: [PATCH 606/755] tdesktop: 1.9.7 -> 1.9.8

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

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 66dab786b7c1..3f6d9c498980 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -18,14 +18,14 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.7";
+  version = "1.9.8";
   # Note: Due to our strong dependency on the Arch patches it's probably best
   # to also wait for the Arch update (especially if the patches don't apply).
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1hj7bv11alc8cfffy0k3za4missdr44cdmia93xn77w012qjn8a4";
+    sha256 = "1rq3180l4ly0n0jj08cxy9l2d07scwp9hasmliva2xspyv7i9ksd";
   };
 
   # Arch patches (svn export telegram-desktop/trunk)

From 97410b59f3f6b04e0102f75315390877383892aa Mon Sep 17 00:00:00 2001
From: samlich <1349989+samlich@users.noreply.github.com>
Date: Fri, 24 Jan 2020 19:42:59 +0000
Subject: [PATCH 607/755] pymol: 2.1.0 -> 2.3.0

---
 .../science/chemistry/pymol/default.nix       | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index b1bd01fb2f7f..2169aef4fc08 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,15 +1,10 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ lib, stdenv, fetchurl, fetchFromGitHub, makeDesktopItem
 , python3, python3Packages
-, glew, freeglut, libpng, libxml2, tk, freetype, msgpack }:
+, glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }:
 
 
-with stdenv.lib;
-
 let
   pname = "pymol";
-  ver_maj = "2";
-  ver_min = "1";
-  version = "${ver_maj}.${ver_min}.0";
   description = "A Python-enhanced molecular graphics tool";
 
   desktopItem = makeDesktopItem {
@@ -22,15 +17,20 @@ let
     categories = "Graphics;Education;Science;Chemistry;";
   };
 in
-python3Packages.buildPythonApplication {
-  name = "pymol-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2";
-    sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
+python3Packages.buildPythonApplication rec {
+  inherit pname;
+  version = "2.3.0";
+  src = fetchFromGitHub {
+    owner = "schrodinger";
+    repo = "pymol-open-source";
+    rev = "v${version}";
+    sha256 = "175cqi6gfmvv49i3ws19254m7ljs53fy6y82fm1ywshq2h2c93jh";
   };
 
-  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype msgpack ];
-  NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
+  buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack ];
+  NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2 -Wno-error=format-security";
+
+  setupPyBuildFlags = [ "--glut" ];
 
   installPhase = ''
     python setup.py install --home=$out
@@ -40,13 +40,12 @@ python3Packages.buildPythonApplication {
 
   postInstall = with python3Packages; ''
     wrapProgram $out/bin/pymol \
-      --prefix PYTHONPATH : ${makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]}
+      --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]}
   '';
 
   meta = {
     description = description;
     homepage = https://www.pymol.org/;
-    license = licenses.psfl;
-    broken = true;
+    license = lib.licenses.psfl;
   };
 }

From db6ef4dccfa6ca05c6bf368137a48f9d6b94b238 Mon Sep 17 00:00:00 2001
From: samlich <1349989+samlich@users.noreply.github.com>
Date: Fri, 24 Jan 2020 19:43:52 +0000
Subject: [PATCH 608/755] maintainers: add samlich

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bcfc7007b6b1..acd8bbcde8fd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6181,6 +6181,16 @@
     githubId = 6022042;
     name = "Sam Parkinson";
   };
+  samlich = {
+    email = "nixos@samli.ch";
+    github = "samlich";
+    githubId = 1349989;
+    name = "samlich";
+    keys = [{
+      longkeyid = "rsa4096/B1568953B1939F1C";
+      fingerprint = "AE8C 0836 FDF6 3FFC 9580  C588 B156 8953 B193 9F1C";
+    }];
+  };
   samrose = {
    email = "samuel.rose@gmail.com";
    github = "samrose";

From 3638755ff37ef01c8a95a2e54d209aea4e2e0aa9 Mon Sep 17 00:00:00 2001
From: samlich <1349989+samlich@users.noreply.github.com>
Date: Fri, 24 Jan 2020 19:49:38 +0000
Subject: [PATCH 609/755] pymol: add samlich as maintainer

---
 pkgs/applications/science/chemistry/pymol/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 2169aef4fc08..b20e7480657c 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -47,5 +47,6 @@ python3Packages.buildPythonApplication rec {
     description = description;
     homepage = https://www.pymol.org/;
     license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ samlich ];
   };
 }

From 77317774ce91f6e6aedcfa62ec7c9c2e30d4d5c0 Mon Sep 17 00:00:00 2001
From: samlich <1349989+samlich@users.noreply.github.com>
Date: Fri, 24 Jan 2020 19:51:08 +0000
Subject: [PATCH 610/755] pymol: link desktop icon

---
 pkgs/applications/science/chemistry/pymol/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index b20e7480657c..a0e1fa5a3aef 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -13,6 +13,7 @@ let
     desktopName = "PyMol Molecular Graphics System";
     genericName = "Molecular Modeler";
     comment = description;
+    icon = pname;
     mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;";
     categories = "Graphics;Education;Science;Chemistry;";
   };
@@ -33,14 +34,17 @@ python3Packages.buildPythonApplication rec {
   setupPyBuildFlags = [ "--glut" ];
 
   installPhase = ''
-    python setup.py install --home=$out
-    cp -r ${desktopItem}/share/ $out/
+    python setup.py install --home="$out"
     runHook postInstall
   '';
 
   postInstall = with python3Packages; ''
     wrapProgram $out/bin/pymol \
       --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]}
+
+    mkdir -p "$out/share/icons/"
+    ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg"
+    cp -r "${desktopItem}/share/applications/" "$out/share/"
   '';
 
   meta = {

From 2f4dea687ccf1027a3346570397547ea9532eba1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2020 19:19:55 +0100
Subject: [PATCH 611/755] LTS Haskell 14.21

---
 .../configuration-hackage2nix.yaml            | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a72ee71af3ac..8907e6a8ef1a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -69,7 +69,7 @@ core-packages:
 default-package-overrides:
   # pandoc-2.9 does not accept the 0.3 version yet
   - doclayout < 0.3
-  # LTS Haskell 14.20
+  # LTS Haskell 14.21
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -165,10 +165,10 @@ default-package-overrides:
   - avers ==0.0.17.1
   - avers-api ==0.1.0
   - avers-server ==0.1.0.1
-  - avro ==0.4.5.4
+  - avro ==0.4.6.0
   - avwx ==0.3.0.2
   - aws-cloudfront-signed-cookies ==0.2.0.1
-  - aws-lambda-haskell-runtime ==2.0.2
+  - aws-lambda-haskell-runtime ==2.0.3
   - backprop ==0.2.6.3
   - bank-holidays-england ==0.2.0.2
   - barbies ==1.1.3.0
@@ -176,7 +176,7 @@ default-package-overrides:
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
   - base58string ==0.10.0
-  - base64-bytestring ==1.0.0.2
+  - base64-bytestring ==1.0.0.3
   - base64-bytestring-type ==1.0.1
   - base64-string ==0.2
   - base-compat ==0.10.5
@@ -197,7 +197,7 @@ default-package-overrides:
   - beam-sqlite ==0.4.0.0
   - bench ==1.0.12
   - benchpress ==0.2.2.12
-  - bench-show ==0.3.0
+  - bench-show ==0.3.1
   - bencode ==0.6.0.0
   - bencoding ==0.4.5.2
   - between ==0.11.0.0
@@ -323,8 +323,8 @@ default-package-overrides:
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
-  - Chart ==1.9.1
-  - Chart-diagrams ==1.9.2
+  - Chart ==1.9.3
+  - Chart-diagrams ==1.9.3
   - chaselev-deque ==0.5.0.5
   - cheapskate ==0.1.1.1
   - cheapskate-highlight ==0.1.0.0
@@ -340,7 +340,7 @@ default-package-overrides:
   - chronos-bench ==0.2.0.2
   - chunked-data ==0.3.1
   - cipher-aes ==0.2.11
-  - cipher-aes128 ==0.7.0.4
+  - cipher-aes128 ==0.7.0.5
   - cipher-blowfish ==0.0.3
   - cipher-camellia ==0.0.2
   - cipher-des ==0.0.6
@@ -370,7 +370,7 @@ default-package-overrides:
   - codo-notation ==0.5.2
   - coercible-utils ==0.0.0
   - co-log ==0.3.0.0
-  - co-log-core ==0.2.0.0
+  - co-log-core ==0.2.1.0
   - colonnade ==1.2.0.2
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
@@ -440,7 +440,7 @@ default-package-overrides:
   - credential-store ==0.1.2
   - criterion ==1.5.6.1
   - criterion-measurement ==0.1.2.0
-  - cron ==0.6.1
+  - cron ==0.6.2
   - crypto-api ==0.13.3
   - crypto-api-tests ==0.3
   - cryptocipher ==0.6.2
@@ -481,7 +481,7 @@ default-package-overrides:
   - currency ==0.2.0.0
   - cusparse ==0.2.0.0
   - cutter ==0.0
-  - cyclotomic ==1.0
+  - cyclotomic ==1.0.1
   - czipwith ==1.0.1.2
   - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
@@ -517,7 +517,7 @@ default-package-overrides:
   - data-textual ==0.3.0.3
   - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
-  - DAV ==1.3.3
+  - DAV ==1.3.4
   - dbcleaner ==0.1.3
   - DBFunctor ==0.1.1.1
   - dbus ==1.2.7
@@ -724,7 +724,7 @@ default-package-overrides:
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.9
   - fold-debounce-conduit ==0.2.0.4
-  - foldl ==1.4.5
+  - foldl ==1.4.6
   - folds ==0.7.5
   - follow-file ==0.0.3
   - FontyFruity ==0.5.3.5
@@ -781,7 +781,7 @@ default-package-overrides:
   - genvalidity-hspec-cereal ==0.2.0.3
   - genvalidity-hspec-hashable ==0.2.0.4
   - genvalidity-hspec-optics ==0.1.1.1
-  - genvalidity-path ==0.3.0.2
+  - genvalidity-path ==0.3.0.3
   - genvalidity-property ==0.4.0.0
   - genvalidity-scientific ==0.2.1.0
   - genvalidity-text ==0.6.0.0
@@ -803,8 +803,8 @@ default-package-overrides:
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.6
   - ghc-syntax-highlighter ==0.0.4.1
-  - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.3.1
+  - ghc-tcplugins-extra ==0.3.2
+  - ghc-typelits-extra ==0.3.2
   - ghc-typelits-knownnat ==0.6
   - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
@@ -841,7 +841,7 @@ default-package-overrides:
   - gloss-rendering ==1.13.1.1
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.15
-  - gnuplot ==0.5.6
+  - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
   - google-oauth2-jwt ==0.3.2
   - gpolyline ==0.1.0.1
@@ -916,7 +916,7 @@ default-package-overrides:
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
-  - hedgehog ==1.0.1
+  - hedgehog ==1.0.2
   - hedgehog-corpus ==0.1.0
   - hedgehog-fn ==1.0
   - hedis ==0.12.11
@@ -983,7 +983,7 @@ default-package-overrides:
   - HSet ==0.0.1
   - hset ==2.2.0
   - hsexif ==0.6.1.6
-  - hs-functors ==0.1.4.0
+  - hs-functors ==0.1.5.0
   - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
   - hsinstall ==2.2
@@ -1211,7 +1211,7 @@ default-package-overrides:
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.14
-  - language-puppet ==1.4.6
+  - language-puppet ==1.4.6.1
   - lapack ==0.3.1
   - lapack-carray ==0.0.3
   - lapack-comfort-array ==0.0.0.1
@@ -1227,7 +1227,7 @@ default-package-overrides:
   - leancheck ==0.9.1
   - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
-  - learn-physics ==0.6.4
+  - learn-physics ==0.6.5
   - lens ==4.17.1
   - lens-action ==0.2.4
   - lens-aeson ==1.0.2
@@ -1312,7 +1312,7 @@ default-package-overrides:
   - matplotlib ==0.7.5
   - matrices ==0.5.0
   - matrix ==0.3.6.1
-  - matrix-market-attoparsec ==0.1.0.8
+  - matrix-market-attoparsec ==0.1.1.3
   - matrix-static ==0.2.1
   - maximal-cliques ==0.1.1
   - mbox ==0.3.4
@@ -1387,7 +1387,7 @@ default-package-overrides:
   - monad-peel ==0.2.1.2
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.1.1
+  - MonadRandom ==0.5.1.2
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
@@ -1523,7 +1523,7 @@ default-package-overrides:
   - options ==1.2.1.1
   - optparse-applicative ==0.14.3.0
   - optparse-enum ==1.0.0.0
-  - optparse-generic ==1.3.0
+  - optparse-generic ==1.3.1
   - optparse-simple ==0.1.1.2
   - optparse-text ==0.1.1.0
   - ordered-containers ==0.2.2
@@ -1556,8 +1556,8 @@ default-package-overrides:
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.2.1
   - partial-semigroup ==0.5.1.1
-  - password ==0.1.0.0
-  - password-instances ==0.3.0.0
+  - password ==0.1.0.1
+  - password-instances ==0.3.0.1
   - path ==0.6.1
   - path-extra ==0.2.0
   - path-io ==1.4.2
@@ -1644,7 +1644,7 @@ default-package-overrides:
   - postgresql-orm ==0.5.1
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.6.2
-  - postgresql-simple-migration ==0.1.14.0
+  - postgresql-simple-migration ==0.1.15.0
   - postgresql-simple-queue ==1.0.1
   - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
@@ -1704,7 +1704,7 @@ default-package-overrides:
   - psqueues ==0.2.7.2
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.13.0.0
-  - pure-zlib ==0.6.6
+  - pure-zlib ==0.6.7
   - pushbullet-types ==0.4.1.0
   - pusher-http-haskell ==1.5.1.11
   - qchas ==1.1.0.1
@@ -1815,7 +1815,7 @@ default-package-overrides:
   - rhine ==0.5.1.0
   - rhine-gloss ==0.5.1.0
   - rigel-viz ==0.2.0.0
-  - rio ==0.1.12.0
+  - rio ==0.1.13.0
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.0.0
   - roc-id ==0.1.0.0
@@ -1851,8 +1851,8 @@ default-package-overrides:
   - say ==0.1.0.1
   - sbp ==2.6.3
   - sbv ==8.3
-  - scalpel ==0.6.0
-  - scalpel-core ==0.6.0
+  - scalpel ==0.6.1
+  - scalpel-core ==0.6.1
   - scanf ==0.1.0.0
   - scanner ==0.3.1
   - scheduler ==1.4.2.1
@@ -1864,7 +1864,7 @@ default-package-overrides:
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.1.0
-  - secp256k1-haskell ==0.1.6
+  - secp256k1-haskell ==0.1.8
   - securemem ==0.1.10
   - selda ==0.4.0.0
   - selda-json ==0.1.1.0
@@ -2010,7 +2010,7 @@ default-package-overrides:
   - statestack ==0.2.0.5
   - StateVar ==1.2
   - static-text ==0.2.0.4
-  - statistics ==0.15.1.1
+  - statistics ==0.15.2.0
   - stb-image-redux ==0.2.1.3
   - step-function ==0.2
   - stm-chans ==3.0.0.4
@@ -2031,7 +2031,7 @@ default-package-overrides:
   - streaming-attoparsec ==1.0.0.1
   - streaming-bytestring ==0.1.6
   - streaming-cassava ==0.1.0.1
-  - streaming-commons ==0.2.1.1
+  - streaming-commons ==0.2.1.2
   - streaming-wai ==0.1.1
   - streamly ==0.6.1
   - streamproc ==1.6.2
@@ -2097,7 +2097,7 @@ default-package-overrides:
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.2
   - tasty-golden ==2.3.2
-  - tasty-hedgehog ==1.0.0.1
+  - tasty-hedgehog ==1.0.0.2
   - tasty-hspec ==1.1.5.1
   - tasty-hunit ==0.10.0.2
   - tasty-kat ==0.0.3
@@ -2193,7 +2193,7 @@ default-package-overrides:
   - tldr ==0.4.0.2
   - tls ==1.4.1
   - tls-debug ==0.4.5
-  - tls-session-manager ==0.0.3
+  - tls-session-manager ==0.0.4
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.2.0.0
@@ -2248,7 +2248,7 @@ default-package-overrides:
   - typerep-map ==0.3.2
   - type-spec ==0.4.0.0
   - tz ==0.1.3.3
-  - tzdata ==0.1.20190325.0
+  - tzdata ==0.1.20190911.0
   - ua-parser ==0.7.5.1
   - ucam-webauth ==0.1.0.0
   - ucam-webauth-types ==0.1.0.0
@@ -2335,7 +2335,7 @@ default-package-overrides:
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.7
   - verbosity ==0.3.0.0
-  - versions ==3.5.1.1
+  - versions ==3.5.2
   - ViennaRNAParser ==1.3.3
   - viewprof ==0.0.0.32
   - vinyl ==0.11.0
@@ -2345,14 +2345,14 @@ default-package-overrides:
   - void ==0.7.3
   - vty ==5.25.1
   - wai ==3.2.2.1
-  - wai-app-static ==3.1.6.3
+  - wai-app-static ==3.1.7.1
   - wai-cli ==0.2.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.28
-  - wai-handler-launch ==3.0.2.4
+  - wai-extra ==3.0.29
+  - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.3.5
   - wai-middleware-auth ==0.1.2.1
   - wai-middleware-caching ==0.1.0.2
@@ -2455,7 +2455,7 @@ default-package-overrides:
   - yesod ==1.6.0
   - yesod-alerts ==0.1.3.0
   - yesod-auth ==1.6.8
-  - yesod-auth-hashdb ==1.7.1.1
+  - yesod-auth-hashdb ==1.7.1.2
   - yesod-auth-oauth2 ==0.6.1.2
   - yesod-bin ==1.6.0.4
   - yesod-core ==1.6.17

From 67e8740904847666430049722e3ab4070a0e7789 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Jan 2020 20:20:36 +0100
Subject: [PATCH 612/755] hackage2nix: update the list of broken packages

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8907e6a8ef1a..b4e17dd59c85 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6611,6 +6611,7 @@ broken-packages:
   - json-pointer-hasql
   - json-python
   - json-schema
+  - json-syntax
   - json-togo
   - json-tokens
   - json-tools
@@ -6862,6 +6863,7 @@ broken-packages:
   - legion-extra
   - leksah-server
   - lendingclub
+  - lens-core
   - lens-filesystem
   - lens-prelude
   - lens-text-encoding
@@ -7487,6 +7489,7 @@ broken-packages:
   - musicxml
   - musicxml2
   - mustache-haskell
+  - mutable
   - mutable-iter
   - MutationOrder
   - mute-unmute
@@ -9505,6 +9508,7 @@ broken-packages:
   - tamarin-prover-utils
   - tamper
   - Tape
+  - tar-bytestring
   - target
   - tart
   - task
@@ -9693,6 +9697,8 @@ broken-packages:
   - tip-haskell-frontend
   - tip-lib
   - titan
+  - titan-debug-yampa
+  - titan-record-yampa
   - Titim
   - tkhs
   - tkyprof

From d8440b802eda7d8d14848e81d368fa42f9a61cfa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 18 Jan 2020 02:30:36 +0100
Subject: [PATCH 613/755] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ac7dcf389a3abb9b640ada0974250f6b36f78a9e.
---
 .../haskell-modules/hackage-packages.nix      | 3001 ++++++++++-------
 1 file changed, 1803 insertions(+), 1198 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9de3c0c31706..dd8d563e42e2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2913,10 +2913,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.9.1";
-       sha256 = "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l";
-       revision = "1";
-       editedCabalFile = "1v7qip375kzn9k9k0c79jj55xigi05s5dl318smqazjdlyj55q55";
+       version = "1.9.3";
+       sha256 = "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -2931,10 +2929,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.9.1";
-       sha256 = "0hknj4rsjf2m8p5pyq5zff8ai7v80yvmxb5c6n0bkgxs4317nbl9";
-       revision = "1";
-       editedCabalFile = "1c1m0vk4rnx3myv43kag17nf1j1w9kjc226jpf1f86gkcd35lq45";
+       version = "1.9.3";
+       sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -2951,10 +2947,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.9.2";
-       sha256 = "0am51ck84apijwwvpkwhnpmsr4047svzdi7g5nbf5yprsb8vzd4n";
-       revision = "1";
-       editedCabalFile = "0h57ds1j43h4knnwb75dgsgw90mz7lf8k590dkfdrgsszpb9as50";
+       version = "1.9.3";
+       sha256 = "075yzq50jpakgq6lb3anr660jydm68ry0di33icdacbdymq8avwn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
@@ -2972,8 +2966,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.9.1";
-       sha256 = "1lhl7ayyydg5z5zwpr3k4313565p4za3z2f3ngd4hpicp7zbmhx0";
+       version = "1.9.3";
+       sha256 = "0wdv193wsadzrkpxl6lzw2r11bvr4fnfhmzqcmpqns3psqpgk43f";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2982,6 +2976,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-gtk3" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour
+     , data-default-class, gtk3, mtl, old-locale, time
+     }:
+     mkDerivation {
+       pname = "Chart-gtk3";
+       version = "1.9.3";
+       sha256 = "0lldchq419fivczas2sbbz45b1xlf2chd7a2af66mbigdbld3xka";
+       libraryHaskellDepends = [
+         array base cairo Chart Chart-cairo colour data-default-class gtk3
+         mtl old-locale time
+       ];
+       description = "Utility functions for using the chart library with GTK";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Chart-simple" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, Chart-gtk
      , colour, data-default-class, gtk, mtl, old-locale, time
@@ -3000,6 +3010,30 @@ self: {
        broken = true;
      }) {};
 
+  "Chart-tests" = callPackage
+    ({ mkDerivation, array, base, bytestring, cairo, Chart, Chart-cairo
+     , Chart-diagrams, Chart-gtk, colour, containers, data-default-class
+     , diagrams-cairo, diagrams-core, diagrams-lib, diagrams-postscript
+     , diagrams-svg, doctest, gtk, lens, mtl, old-locale, old-time
+     , random, svg-builder, time
+     }:
+     mkDerivation {
+       pname = "Chart-tests";
+       version = "1.9.3";
+       sha256 = "1xhjd400xf235m345mhn98hjrvvv5qdr90paq4kixh2g0aswnhrd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring cairo Chart Chart-cairo Chart-diagrams
+         Chart-gtk colour containers data-default-class diagrams-cairo
+         diagrams-core diagrams-lib diagrams-postscript diagrams-svg gtk
+         lens mtl old-locale old-time random svg-builder time
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Tests of the Charts library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ChasingBottoms" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
@@ -3788,35 +3822,6 @@ self: {
      }) {};
 
   "DAV" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , data-default, exceptions, haskeline, http-client, http-client-tls
-     , http-types, lens, mtl, network, network-uri, optparse-applicative
-     , transformers, transformers-base, transformers-compat, utf8-string
-     , xml-conduit, xml-hamlet
-     }:
-     mkDerivation {
-       pname = "DAV";
-       version = "1.3.3";
-       sha256 = "149rdrbjx59a2rbx2r6fzhmyl3f35a2gbh4sarbpffv0pmirrx14";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         http-client http-client-tls http-types lens mtl transformers
-         transformers-base transformers-compat utf8-string xml-conduit
-         xml-hamlet
-       ];
-       executableHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         haskeline http-client http-client-tls http-types lens mtl network
-         network-uri optparse-applicative transformers transformers-base
-         transformers-compat utf8-string xml-conduit xml-hamlet
-       ];
-       description = "RFC 4918 WebDAV support";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "DAV_1_3_4" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , data-default, exceptions, haskeline, http-client, http-client-tls
      , http-types, lens, mtl, network, network-uri, optparse-applicative
@@ -3843,7 +3848,6 @@ self: {
        ];
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DBFunctor" = callPackage
@@ -5936,8 +5940,8 @@ self: {
      }:
      mkDerivation {
        pname = "Fin";
-       version = "0.2.7.0";
-       sha256 = "0w29dc2mdy0q3y5v6mkc0m51vp1bmbx8bswvr1khby63vb5zwcf3";
+       version = "0.2.8.0";
+       sha256 = "1smzghfifiqakbv9308bz5b4mkzmrfvgs6zpry5nw2lbqh7crcc7";
        libraryHaskellDepends = [
          alg base foldable1 natural-induction peano universe-base
        ];
@@ -13524,10 +13528,8 @@ self: {
      }:
      mkDerivation {
        pname = "MonadRandom";
-       version = "0.5.1.1";
-       sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb";
-       revision = "3";
-       editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w";
+       version = "0.5.1.2";
+       sha256 = "0j1lwg3pp77cf87bk0c1gipzrdvpjcj7bkgi37lcjc7avmlhwvvp";
        libraryHaskellDepends = [
          base mtl primitive random transformers transformers-compat
        ];
@@ -19847,8 +19849,7 @@ self: {
        ];
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "Unixutils" = callPackage
@@ -23758,6 +23759,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-match-qq" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
+     , either, haskell-src-meta, hspec, scientific, template-haskell
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-match-qq";
+       version = "1.0.0";
+       sha256 = "0py6h62a9h7wmrgcc79inbpx5b3jv660jlf5hqc1hdnvmf96prkr";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either haskell-src-meta scientific
+         template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base hspec unordered-containers
+       ];
+       description = "Matching Aeson values with a quasiquoter";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "aeson-native" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder
      , blaze-textual-native, bytestring, containers, deepseq, hashable
@@ -29682,8 +29703,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.16.0.0";
-       sha256 = "1va2h0sbmx15a29ffmnqqidwzj1kk6dbcgdlcx2lpfk3cwwnpj8m";
+       version = "0.17.0.0";
+       sha256 = "0mks971svg5m7h7bxgai33b8ksbgbvri3lw9cp7q8mycvmgslssh";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text tls transformers
@@ -30916,8 +30937,8 @@ self: {
      }:
      mkDerivation {
        pname = "archive-libarchive";
-       version = "0.2.2.0";
-       sha256 = "0gxhfimfyz4ik8qrin9hf70rmgdalrgc2dark6pp3xnkv1hnxw8r";
+       version = "0.2.2.1";
+       sha256 = "1rwvz196m837h5vxm7aqlyzc07h2y2q0czgpn8kwx2gjngpnmmdn";
        libraryHaskellDepends = [
          base bytestring composition-prelude libarchive
        ];
@@ -30934,8 +30955,8 @@ self: {
      }:
      mkDerivation {
        pname = "archive-sig";
-       version = "0.2.2.0";
-       sha256 = "1dia7j8kqjps6s67xd25fqd21wvnsp89lcvkyabvr47skfjaag3l";
+       version = "0.2.3.0";
+       sha256 = "0zpi4kqd4g298xlcmsk30kpahmlfgmxany3mny1zpzd8968qn5za";
        libraryHaskellDepends = [
          base bytestring composition-prelude dir-traverse
        ];
@@ -30948,8 +30969,8 @@ self: {
      }:
      mkDerivation {
        pname = "archive-tar";
-       version = "0.2.2.0";
-       sha256 = "1rvygznl8vwsbbdr0rin925w380c3ncqf486pdzy8jx62naip02q";
+       version = "0.2.2.1";
+       sha256 = "0pwdjx2f78cs3z81hr9ax0iaq6fk6bdvywdp2q8vpjagrfbjcn8k";
        libraryHaskellDepends = [
          base bytestring composition-prelude tar
        ];
@@ -32146,6 +32167,8 @@ self: {
        pname = "asif";
        version = "6.0.4";
        sha256 = "1613r90sfw7q0gsiyjd8j9s1gcjmwj4lsngx3qqpykcivy2ggs03";
+       revision = "1";
+       editedCabalFile = "02gz317ivpmb5yzifm3fv62cik4fh77j7ilb027z6dpx4r041p9w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33810,6 +33833,26 @@ self: {
        broken = true;
      }) {};
 
+  "aur_6_3_0" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+     , servant-client, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "aur";
+       version = "6.3.0";
+       sha256 = "0q8sirx52hm6yh09383r1li5l4jra8vscnzs7nz44q8nd89rq22i";
+       libraryHaskellDepends = [
+         aeson base http-client servant servant-client text
+       ];
+       testHaskellDepends = [
+         base http-client http-client-tls tasty tasty-hunit
+       ];
+       description = "Access metadata from the Arch Linux User Repository";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "aur-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, hspec
      , http-client, http-client-tls, mtl, text
@@ -34344,40 +34387,6 @@ self: {
      }) {};
 
   "avro" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, bytestring, containers, data-binary-ieee754, deepseq
-     , directory, extra, fail, gauge, hashable, hspec, hspec-discover
-     , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random
-     , raw-strings-qq, scientific, semigroups, tagged, template-haskell
-     , text, tf-random, transformers, unordered-containers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "avro";
-       version = "0.4.5.4";
-       sha256 = "0syf968w8vvb5x18znnzc36w5i4ab1fsdpwsph31sxz3rvsv9sr6";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers data-binary-ieee754 deepseq fail hashable mtl scientific
-         semigroups tagged template-haskell text tf-random
-         unordered-containers vector zlib
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers directory extra fail hashable hspec lens lens-aeson mtl
-         pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged
-         text tf-random transformers unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring containers gauge hashable mtl random
-         raw-strings-qq template-haskell text transformers
-         unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_4_6_0" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
      , binary, bytestring, containers, data-binary-ieee754, deepseq
      , directory, doctest, doctest-discover, extra, fail, gauge
@@ -34411,7 +34420,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avro-piper" = callPackage
@@ -34948,24 +34956,6 @@ self: {
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-client
-     , http-types, path, path-io, safe-exceptions-checked
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "aws-lambda-haskell-runtime";
-       version = "2.0.2";
-       sha256 = "11pkvq3d5w56bsqdha9cfsbqw0rhfda9bh7zipik1b0lc3mk8p0a";
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-types path path-io
-         safe-exceptions-checked template-haskell text
-       ];
-       testHaskellDepends = [ base hspec ];
-       description = "Haskell runtime for AWS Lambda";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "aws-lambda-haskell-runtime_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-client
      , http-types, path, path-io, safe-exceptions-checked
      , template-haskell, text
@@ -34981,7 +34971,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -36544,27 +36533,6 @@ self: {
      }) {};
 
   "base64-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , HUnit, QuickCheck, split, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "base64-bytestring";
-       version = "1.0.0.2";
-       sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring containers HUnit QuickCheck split test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq
-       ];
-       description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base64-bytestring_1_0_0_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , HUnit, QuickCheck, split, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -36583,7 +36551,6 @@ self: {
        ];
        description = "Fast base64 encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base64-bytestring-type" = callPackage
@@ -37483,8 +37450,8 @@ self: {
     ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
      mkDerivation {
        pname = "bearriver";
-       version = "0.10.4.6";
-       sha256 = "1m038d6brzp2h2fbwmxvwazm9d59sf5r2nlnw2csmdkck11zzw3j";
+       version = "0.13.1";
+       sha256 = "1mkvn05gdazg8inc61vzswwcm53m6xpv7ly4gs5ms6bfqh406xm5";
        libraryHaskellDepends = [
          base dunai MonadRandom mtl transformers
        ];
@@ -37663,32 +37630,6 @@ self: {
      }) {};
 
   "bench-show" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
-     , directory, filepath, mwc-random, optparse-applicative
-     , optparse-simple, semigroups, split, statistics, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "bench-show";
-       version = "0.3.0";
-       sha256 = "0c690w96iyj6idikcwl75ci5sqvfh4fdd8mvb4z24x3xb24kirh5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
-         mwc-random split statistics transformers vector
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
-         mwc-random optparse-applicative optparse-simple semigroups split
-         statistics transformers vector
-       ];
-       testHaskellDepends = [ base split text ];
-       description = "Show, plot and compare benchmark results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bench-show_0_3_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
      , directory, filepath, mwc-random, optparse-applicative
      , optparse-simple, semigroups, split, statistics, text
@@ -37712,7 +37653,6 @@ self: {
        testHaskellDepends = [ base split text ];
        description = "Show, plot and compare benchmark results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -38431,7 +38371,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_7_0" = callPackage
+  "binary_0_8_8_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring
      , Cabal, cereal, containers, criterion, deepseq, directory
      , filepath, generic-deriving, HUnit, mtl, QuickCheck, random
@@ -38440,8 +38380,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.7.0";
-       sha256 = "1r29yg94imhrbzjsv8ghf3217rhlas7945cp9i3dxzskzviyz78x";
+       version = "0.8.8.0";
+       sha256 = "01dwxak6j4499599r22c422js68gn6irxfa3hplzhn7rrx82r6h5";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base base-orphans bytestring Cabal containers directory
@@ -42461,8 +42401,8 @@ self: {
      }:
      mkDerivation {
        pname = "bookkeeping-jp";
-       version = "0.1.1.3";
-       sha256 = "06zfq2153p6dnrmrp3vdq27xij38l5cnx46y3qpzifrpsady6lgd";
+       version = "0.1.1.4";
+       sha256 = "109bxawdh7a21mws1vv9hsdhm35f3air90c8wx2adlsj5sv7qdin";
        libraryHaskellDepends = [
          base bookkeeping mono-traversable text time
        ];
@@ -43715,8 +43655,8 @@ self: {
      }:
      mkDerivation {
        pname = "brok";
-       version = "0.1.6.0";
-       sha256 = "15gvlkhb349328w9fngs2k87qpp2r6g9ilxv64df8mzx5y9nrx0k";
+       version = "0.1.7.0";
+       sha256 = "1961s6ccr5x81jym34y1437pa7ml4jsxnw4gd1r496h8mh9lcm99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45027,15 +44967,19 @@ self: {
 
   "byteslice" = callPackage
     ({ mkDerivation, base, bytestring, primitive, primitive-addr
-     , run-st, tasty, tasty-hunit, tasty-quickcheck
+     , primitive-unlifted, quickcheck-classes, run-st, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "byteslice";
-       version = "0.1.4.0";
-       sha256 = "0kpamfmbgc31xha3p3rm2mqgngmdivkxl4z8lr0rjbil16r02nqr";
-       libraryHaskellDepends = [ base primitive primitive-addr run-st ];
+       version = "0.2.1.0";
+       sha256 = "0dwvxj0rxk7jfb4yjwrr7jwxwv0f5bz8h21wrr4hw7max2wfanll";
+       libraryHaskellDepends = [
+         base primitive primitive-addr primitive-unlifted run-st
+       ];
        testHaskellDepends = [
-         base bytestring primitive tasty tasty-hunit tasty-quickcheck
+         base bytestring primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck
        ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
@@ -45050,10 +44994,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytesmith";
-       version = "0.3.2.0";
-       sha256 = "0wbmi3wgf85rkhymjiv19dq93i2mg9i74dl37lpkq317qlihgv6f";
-       revision = "1";
-       editedCabalFile = "10r36zdpl96cv2jmkddfq92h78bx6785gjb29769c1dw0nnlvj94";
+       version = "0.3.3.0";
+       sha256 = "08q2wpdj3na06n7k1ig27i67csby6yy2vhrgcdpmsi1jx8as9nwh";
        libraryHaskellDepends = [
          base byteslice bytestring contiguous primitive run-st text-short
          wide-word
@@ -45582,6 +45524,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bz2" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs }:
+     mkDerivation {
+       pname = "bz2";
+       version = "0.1.0.1";
+       sha256 = "07ry2y8xlm6m54qqriwmrcw2m9dal5mr728y3gzsfy104f1w80bf";
+       revision = "1";
+       editedCabalFile = "0wbhhcmi7wjyjp82sj0ifi3i5hblzdda66jyzcb66rdwi2547jd2";
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       description = "Bindings to libbz2";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "bzip-signature" = callPackage
+    ({ mkDerivation, base, bytestring, composition-prelude }:
+     mkDerivation {
+       pname = "bzip-signature";
+       version = "0.1.1.0";
+       sha256 = "154birx50dzgpiz3x34lmd2flmwv41y5b6kvx6imskzqf3nwmcv2";
+       libraryHaskellDepends = [ base bytestring composition-prelude ];
+       description = "Backpack signature for BZip compression";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bzlib" = callPackage
     ({ mkDerivation, base, bytestring, bzip2 }:
      mkDerivation {
@@ -50600,6 +50567,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cheapskate_0_1_1_2" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "cheapskate";
+       version = "0.1.1.2";
+       sha256 = "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html containers data-default deepseq mtl syb text
+         uniplate xss-sanitize
+       ];
+       executableHaskellDepends = [ base blaze-html bytestring text ];
+       description = "Experimental markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cheapskate-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate
      , text
@@ -51611,27 +51598,6 @@ self: {
      }) {};
 
   "cipher-aes128" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cereal, criterion
-     , crypto-api, entropy, process, tagged
-     }:
-     mkDerivation {
-       pname = "cipher-aes128";
-       version = "0.7.0.4";
-       sha256 = "1182s7984zjxz53nnjyki5afhfq8h5wjfmg6cqy9z0x1q63qk3fd";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal process ];
-       libraryHaskellDepends = [
-         base bytestring cereal crypto-api tagged
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring cereal criterion crypto-api entropy tagged
-       ];
-       description = "AES and common modes using AES-NI when available";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cipher-aes128_0_7_0_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cereal, criterion
      , crypto-api, entropy, process, tagged
      }:
@@ -51650,7 +51616,6 @@ self: {
        ];
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cipher-blowfish" = callPackage
@@ -54225,12 +54190,40 @@ self: {
        broken = true;
      }) {};
 
+  "co-log_0_4_0_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, chronos
+     , co-log-core, containers, contravariant, directory, filepath
+     , hedgehog, markdown-unlit, mtl, stm, text, transformers
+     , typerep-map, vector
+     }:
+     mkDerivation {
+       pname = "co-log";
+       version = "0.4.0.0";
+       sha256 = "1ayxsxw96yy72h6bsy6vwi4xwdawcq1hgsyc0s626bp84is7fm5c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring chronos co-log-core containers
+         contravariant directory filepath mtl stm text transformers
+         typerep-map vector
+       ];
+       executableHaskellDepends = [
+         base bytestring co-log-core mtl text typerep-map
+       ];
+       executableToolDepends = [ markdown-unlit ];
+       testHaskellDepends = [ base co-log-core hedgehog ];
+       description = "Composable Contravariant Comonadic Logging Library";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "co-log-core" = callPackage
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "co-log-core";
-       version = "0.2.0.0";
-       sha256 = "0q0vhk100qm6dfdfnbgg1mr07d1lzwbfkpkm0ivinfhaz2vnsr2j";
+       version = "0.2.1.0";
+       sha256 = "1jfdjcbhd4mjj00fr2xk7g220kxz4jzbv84j32sqkjnrx49cziz0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Composable Contravariant Comonadic Logging Library";
@@ -54241,10 +54234,8 @@ self: {
     ({ mkDerivation, base, co-log-core, polysemy }:
      mkDerivation {
        pname = "co-log-polysemy";
-       version = "0.0.0.0";
-       sha256 = "02kv0r3ijv410lv9wz40mw4vgv4fmhgrxwppz4l0p50wyra5vq04";
-       revision = "1";
-       editedCabalFile = "1ig0giws954lsrhkw4frwmh01fsghvhpkwpj975n5fxrnzy46xy5";
+       version = "0.0.1.0";
+       sha256 = "1l2ihpi0h704abk1b9nqg1pwch447yhs8g6h29yd4igyy7c6gh9b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base co-log-core polysemy ];
@@ -58007,18 +57998,18 @@ self: {
      }) {};
 
   "conferer" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, hspec
-     , text
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , hspec, text
      }:
      mkDerivation {
        pname = "conferer";
-       version = "0.1.0.4";
-       sha256 = "0zzc6m52a3rsd6cs7ns95rk1bl1gf9dyrz7lx0kakibxpb11sgsy";
+       version = "0.2.0.0";
+       sha256 = "0r666jc016pcpsflxh9lvkxv6fmhnb7agn96gixy8fq3hbksri1v";
        libraryHaskellDepends = [
          base bytestring containers directory text
        ];
        testHaskellDepends = [
-         base bytestring containers directory hspec text
+         base bytestring containers deepseq directory hspec text
        ];
        description = "Configuration management library";
        license = stdenv.lib.licenses.bsd3;
@@ -58028,22 +58019,42 @@ self: {
     ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
      mkDerivation {
        pname = "conferer-hspec";
-       version = "0.1.0.2";
-       sha256 = "1hbvqnp1cdhxg3hcywyygby7z56q2xq1c7qgqhi8n7v89dsza27x";
+       version = "0.2.0.0";
+       sha256 = "1gqll6ag2bgf05z1jsh5z5m8srz5zq6j9c29zbrdbk2smpp5qgz8";
        libraryHaskellDepends = [ base conferer hspec-core text ];
        testHaskellDepends = [ base conferer hspec hspec-core text ];
        description = "conferer's FromConfig instances for hspec Config";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-provider-dhall" = callPackage
+    ({ mkDerivation, base, bytestring, conferer, conferer-provider-json
+     , dhall, dhall-json, directory, hspec, text
+     }:
+     mkDerivation {
+       pname = "conferer-provider-dhall";
+       version = "0.2.0.0";
+       sha256 = "0d0zwx4cqihvv09i45b6c7vhbxp9iiagqx417ikmhan9pki6ykq5";
+       libraryHaskellDepends = [
+         base bytestring conferer conferer-provider-json dhall dhall-json
+         directory text
+       ];
+       testHaskellDepends = [
+         base bytestring conferer conferer-provider-json dhall dhall-json
+         directory hspec text
+       ];
+       description = "Configuration for reading dhall files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "conferer-provider-json" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
      , directory, hspec, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "conferer-provider-json";
-       version = "0.1.0.5";
-       sha256 = "1fsqmp48809fygxg1gz9g9ihm46zr98bbqihw72xr938cq0hazbf";
+       version = "0.2.0.0";
+       sha256 = "1lb1933r852jm8rf8fn7srhsrggibdissrsnwq7ffbk5l64kcd2v";
        libraryHaskellDepends = [
          aeson base bytestring conferer directory text unordered-containers
          vector
@@ -58056,14 +58067,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-provider-yaml" = callPackage
+    ({ mkDerivation, base, conferer, conferer-provider-json, hspec
+     , yaml
+     }:
+     mkDerivation {
+       pname = "conferer-provider-yaml";
+       version = "0.2.0.0";
+       sha256 = "19h18374jkcbhj90f0sbz5fq9h35b4pi6wx0hf4h2n46k0gffq12";
+       libraryHaskellDepends = [
+         base conferer conferer-provider-json yaml
+       ];
+       testHaskellDepends = [
+         base conferer conferer-provider-json hspec yaml
+       ];
+       description = "Configuration for reading yaml files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "conferer-snap" = callPackage
     ({ mkDerivation, base, conferer, hspec, snap-core, snap-server
      , text
      }:
      mkDerivation {
        pname = "conferer-snap";
-       version = "0.1.0.4";
-       sha256 = "1928k3h6sfgyjs56xvwzkx7fax5larwv7a130gqng8q12w5pblns";
+       version = "0.2.0.0";
+       sha256 = "0kvg31i2ffs9ppky8kqszqpq5xaf01zy7k09ifsywmnm96cri9g4";
        libraryHaskellDepends = [
          base conferer snap-core snap-server text
        ];
@@ -58079,8 +58108,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-warp";
-       version = "0.1.0.2";
-       sha256 = "16i84kyhhwy3nm863zf3ap9kv800r8hmn277r5y8gxx7jcqa6caq";
+       version = "0.2.0.0";
+       sha256 = "1ajymzh3jz0ffkaviacl4qdm7n7i8lswkk158vhrhqabpyqpxy6r";
        libraryHaskellDepends = [ base conferer http-types text wai warp ];
        testHaskellDepends = [
          base conferer hspec http-types text wai warp
@@ -58965,6 +58994,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "construct" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest
+     , cereal, directory, doctest, filepath, incremental-parser
+     , markdown-unlit, monoid-subclasses, parsers, rank2classes, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "construct";
+       version = "0.1";
+       sha256 = "0gwpks2nrw4hmvw0m9bs23djjcv7ijjrvp14bdi13lv195c3f3af";
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal incremental-parser
+         monoid-subclasses parsers rank2classes text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring cereal directory doctest filepath
+         incremental-parser monoid-subclasses rank2classes tasty tasty-hunit
+         text
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Haskell version of the Construct library for easy specification of file formats";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -58994,23 +59049,22 @@ self: {
   "consul-haskell" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , connection, either, exceptions, http-client, http-client-tls
-     , http-types, HUnit, lifted-async, lifted-base, monad-control
-     , network, random, retry, stm, tasty, tasty-hunit, text
-     , transformers, unordered-containers, uuid, vector
+     , http-types, HUnit, network, random, retry, stm, tasty
+     , tasty-hunit, text, transformers, typed-process, unliftio
+     , unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "consul-haskell";
-       version = "0.4.2";
-       sha256 = "02nq60nm49pj00ydd6rhxnbzr9igz9qxlgpjz4vp1kpv1nvi425i";
+       version = "0.5.0";
+       sha256 = "1axwkrqkhiaich7swibx9b6fvxbq1sphzxrwzc1q6fqznp568zzl";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring connection either
-         exceptions http-client http-client-tls http-types lifted-async
-         lifted-base monad-control network retry stm text transformers
-         unordered-containers vector
+         exceptions http-client http-client-tls http-types network retry stm
+         text transformers unliftio unordered-containers vector
        ];
        testHaskellDepends = [
-         base http-client HUnit network random tasty tasty-hunit text
-         transformers uuid
+         base bytestring http-client HUnit network random retry tasty
+         tasty-hunit text transformers typed-process unliftio uuid
        ];
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -60142,6 +60196,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "core-data_0_2_1_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, core-text
+     , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "core-data";
+       version = "0.2.1.5";
+       sha256 = "17lvpbyrr9wm93qprk45n5gf3f6k47f9wf7ays0bfk0hx23chc1n";
+       libraryHaskellDepends = [
+         aeson base bytestring containers core-text hashable prettyprinter
+         prettyprinter-ansi-terminal scientific text unordered-containers
+         vector
+       ];
+       description = "Convenience wrappers around common data structures and encodings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "core-haskell" = callPackage
     ({ mkDerivation, base, haskeline, haskell-src-exts, hint }:
      mkDerivation {
@@ -60168,8 +60241,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-program";
-       version = "0.2.3.0";
-       sha256 = "01ycyynnsz1qxnfb3102vyblw2nbdgql765aygrd5awxi04l5v62";
+       version = "0.2.4.1";
+       sha256 = "0ji0vnk7k4rgib6zpid7fjqy1ggf3m88cm6j23bg0lvmj5rvml5c";
        libraryHaskellDepends = [
          async base bytestring chronologique core-data core-text directory
          exceptions filepath fsnotify hashable hourglass mtl prettyprinter
@@ -60199,6 +60272,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "core-text_0_2_3_3" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable
+     , prettyprinter, prettyprinter-ansi-terminal, template-haskell
+     , text, text-short
+     }:
+     mkDerivation {
+       pname = "core-text";
+       version = "0.2.3.3";
+       sha256 = "0bnbl34fzy497a8ljgcydp490j3684yw8r32jijqyix7y9q2cl2d";
+       libraryHaskellDepends = [
+         base bytestring deepseq fingertree hashable prettyprinter
+         prettyprinter-ansi-terminal template-haskell text text-short
+       ];
+       description = "A rope type based on a finger tree over UTF-8 fragments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "corebot-bliki" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , directory, filepath, filestore, http-types, monads-tf, pandoc
@@ -61779,31 +61870,6 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, criterion, data-default-class
-     , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "cron";
-       version = "0.6.1";
-       sha256 = "0l9jigxr271gyf8a69igag5rckvcngv6h93jkf02d43jvqxza6lc";
-       libraryHaskellDepends = [
-         attoparsec base data-default-class mtl mtl-compat old-locale
-         semigroups text time
-       ];
-       testHaskellDepends = [
-         attoparsec base generics-sop quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck text time transformers-compat
-       ];
-       benchmarkHaskellDepends = [ attoparsec base criterion text time ];
-       description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "cron_0_6_2" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, data-default-class
      , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty
      , tasty-hedgehog, tasty-hunit, text, time, transformers-compat
@@ -63814,24 +63880,6 @@ self: {
      }) {};
 
   "cyclotomic" = callPackage
-    ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-smallcheck
-     }:
-     mkDerivation {
-       pname = "cyclotomic";
-       version = "1.0";
-       sha256 = "15mp9wi83anv1vxc6649agak4zn4fqyh2vik5f983269h4xsv12j";
-       libraryHaskellDepends = [ arithmoi base containers ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-smallcheck
-       ];
-       description = "A subfield of the complex numbers for exact calculation";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cyclotomic_1_0_1" = callPackage
     ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-smallcheck
@@ -63847,7 +63895,6 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cypher" = callPackage
@@ -65861,18 +65908,18 @@ self: {
      }) {};
 
   "data-r-tree" = callPackage
-    ({ mkDerivation, base, binary, containers, deepseq, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
+    ({ mkDerivation, base, binary, containers, deepseq, ghc-heap-view
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "data-r-tree";
-       version = "0.0.5.0";
-       sha256 = "1zgwm020zxfhb70llch4y075rd6klwwnv9yn8mpgh0rm0ib7jvyy";
+       version = "0.6.0";
+       sha256 = "07s35yavzcfv6mhyj0cfhgsv1h10k5cq4sb875hb7l2c8jif91nl";
        libraryHaskellDepends = [ base binary deepseq ];
        testHaskellDepends = [
-         base binary containers HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base binary containers deepseq ghc-heap-view HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
        license = stdenv.lib.licenses.mit;
@@ -69036,18 +69083,21 @@ self: {
      }) {};
 
   "describe" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, fixed-vector, QuickCheck
-     , text
+    ({ mkDerivation, base, bytestring, cereal, fixed-vector, lens
+     , mmorph, monad-control, mtl, profunctors, QuickCheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "describe";
-       version = "0.3.1.1";
-       sha256 = "1f9sxvrg4j2xlcimc238d0bd2ya0a0pd696jdjmqk7gvcv7s634q";
+       version = "0.4.0.1";
+       sha256 = "13lnp0yaz18s161d7d2a4cnv2q2kqfm44xqr0jlxcvrmhvr65qdc";
        libraryHaskellDepends = [
-         base bytestring cereal fixed-vector text
+         base bytestring cereal fixed-vector lens mmorph monad-control mtl
+         profunctors text transformers
        ];
        testHaskellDepends = [
-         base bytestring cereal fixed-vector QuickCheck text
+         base bytestring cereal fixed-vector lens mmorph monad-control mtl
+         profunctors QuickCheck text transformers
        ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -69509,6 +69559,8 @@ self: {
        pname = "dhall";
        version = "1.29.0";
        sha256 = "1xp76wv36rfffym71gwdqsmwg3znmpsq5x9zgz3hfmzigxqmjgn7";
+       revision = "2";
+       editedCabalFile = "1qksvk63vmypqcd9hasacmqw7gsqcggs5lk85x7w2731mh3c3sa8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69676,6 +69728,8 @@ self: {
        pname = "dhall-json";
        version = "1.6.1";
        sha256 = "1j89a75rqr90y6yya17iym6c9d6f4sa5hhmv46qbwim9sflv1s9w";
+       revision = "1";
+       editedCabalFile = "07h7vldqd623y7jf15j87mhs3nnbwl3a0121ajqc56qc0vvpgywp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70079,8 +70133,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.8.0.4";
-       sha256 = "11vyybx6hia6s32skrykxr4d6s8yy93m2326945p07qmqwmwmr4w";
+       version = "0.8.0.5";
+       sha256 = "0dz617kfkvjf3f2zbphkdx1scglcjj162qsfk9xj7slbapnj918m";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -75161,6 +75215,19 @@ self: {
        broken = true;
      }) {};
 
+  "dual_0_1_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dual";
+       version = "0.1.1.1";
+       sha256 = "0rf7vywr342llc0p7rmd4l0r8gsaxza0mh6cdb5mg13m9jfb4125";
+       libraryHaskellDepends = [ base ];
+       description = "Dual category";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "dual-game" = callPackage
     ({ mkDerivation, base, bifunctors, cereal, gloss, network
      , websockets
@@ -77967,8 +78034,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-syntax";
-       version = "0.1.0.0";
-       sha256 = "1c8dg5kd0h36j030ig59n1gg1g7y569k92nxg416w4y18z7gir72";
+       version = "0.2.0.0";
+       sha256 = "1fqfsk3xnvl8j49rarchabvw8lq8mflzyzawq5myi74w1gd6ril8";
        libraryHaskellDepends = [
          base bound deriving-compat prettyprinter protolude text
          unordered-containers
@@ -79305,6 +79372,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "envy-extensible" = callPackage
+    ({ mkDerivation, base, doctest, envy, extensible, hspec
+     , hspec-discover, main-tester, QuickCheck
+     }:
+     mkDerivation {
+       pname = "envy-extensible";
+       version = "0.1.0.0";
+       sha256 = "1m5qly9la0b3rxp8amni7nhgisg5vmp3zi76hc1586c202cnsl70";
+       libraryHaskellDepends = [ base envy extensible ];
+       testHaskellDepends = [
+         base doctest envy extensible hspec main-tester QuickCheck
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Provides FromEnv in envy instance for Record of extensible";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "epanet-haskell" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82802,8 +82886,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno";
-       version = "1.1.0";
-       sha256 = "02qg4gd1f1cldh6bg5nrds67vrmhcxnkn8c57gj7400l60ab3yak";
+       version = "1.1.3";
+       sha256 = "0yd4dc6imcp9lf7m0q4ah5z6c47m83302wagps821n8285qvr6zc";
        libraryHaskellDepends = [
          base comonad containers data-default Decimal deepseq event-list
          fadno-braids fadno-xml HUnit lens midi mtl process safe split text
@@ -82824,8 +82908,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-braids";
-       version = "0.1.1";
-       sha256 = "1d8ca0lnvkpqbrfmvk8mash0kgkxwzlzzspsp35n7csp6iyll543";
+       version = "0.1.3";
+       sha256 = "021rm7kdpcgdch57pm9jr6hc220zn9d644wlsbv54z9ll5jj3mlg";
        libraryHaskellDepends = [
          base containers data-default diagrams diagrams-lib
          diagrams-rasterific lens random
@@ -82841,8 +82925,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-xml";
-       version = "1.1.1";
-       sha256 = "0xsklyavmgi0b2qn7758i3ph7ifnkkjyz0yczw5zj4586q184am5";
+       version = "1.1.3";
+       sha256 = "1kydl4nj4j0q4s3sq6r0l42f4ikxq7cdmzkcsavla0fcm0jvj359";
        libraryHaskellDepends = [
          base containers Decimal lens mtl parsec xml
        ];
@@ -82874,6 +82958,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "failable_1_2_4_0" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "failable";
+       version = "1.2.4.0";
+       sha256 = "1vffrjywaxwfpzb6a34il772mkkaqwv9372aibijnvwf82rnglwg";
+       libraryHaskellDepends = [ base mtl transformers ];
+       description = "A 'Failable' error monad class to unify failure across monads that can fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "failable-list" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -83415,10 +83511,8 @@ self: {
     ({ mkDerivation, base, bytestring, cgi, fcgi }:
      mkDerivation {
        pname = "fastcgi";
-       version = "3001.0.2.4";
-       sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
-       revision = "1";
-       editedCabalFile = "12p963nf6375sh1k7dd1m9l0nzq4xwsc099gh1qj2jch59lqgkbl";
+       version = "3001.0.2.5";
+       sha256 = "03y2h3snx23v7i1jgvnayvzk4c1v80qsh9n5dskl7mqhzm2hbygi";
        libraryHaskellDepends = [ base bytestring cgi ];
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
@@ -84102,12 +84196,12 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "fedora-dists_1_1_1" = callPackage
+  "fedora-dists_1_1_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fedora-dists";
-       version = "1.1.1";
-       sha256 = "10yf8hjbrwjwdsfys87cysim8zfknqp1vv336ym8b5qlx700b2ji";
+       version = "1.1.2";
+       sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w";
        libraryHaskellDepends = [ base ];
        description = "Library for Fedora distribution versions";
        license = stdenv.lib.licenses.gpl3;
@@ -85423,6 +85517,8 @@ self: {
        pname = "filesystem-abstractions";
        version = "0";
        sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18";
+       revision = "1";
+       editedCabalFile = "0qfkiify5jgclzdz2gyml5d7rn0vinilwxgfvk0h7743lj2vj167";
        libraryHaskellDepends = [
          base bytestring list-tries posix-paths semigroups
        ];
@@ -87704,28 +87800,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, semigroupoids, semigroups, text, transformers
-     , unordered-containers, vector, vector-builder
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.4.5";
-       sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
-       revision = "4";
-       editedCabalFile = "12qrmlazijyz5dn73p50klyny7x4vx8yw2isfmjikmrr12nhc5g0";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroupoids semigroups text
-         transformers unordered-containers vector vector-builder
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_4_6" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, doctest, hashable, mwc-random
      , primitive, profunctors, semigroupoids, semigroups, text
@@ -87744,7 +87818,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-exceptions" = callPackage
@@ -91158,10 +91231,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.13.2";
-       sha256 = "0wxhymhwfny03n15g29ydrnqblq23szw6l622ifwxz0mk9h71z1d";
-       revision = "1";
-       editedCabalFile = "141fpfhmv9d55ngjd7imq41s0f3dmz2gj4hpfv9pa5kl2g8ddk3s";
+       version = "0.14.1";
+       sha256 = "1bg0r9b0jg9j12lcc6wa684yjm58l020m9x5abpc54cghigywswj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93634,25 +93705,6 @@ self: {
      }) {};
 
   "genvalidity-path" = callPackage
-    ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
-     , hspec, path, QuickCheck, validity-path
-     }:
-     mkDerivation {
-       pname = "genvalidity-path";
-       version = "0.3.0.2";
-       sha256 = "1fj0lc1il2yjlj6wmczvnk505c1dlvz4xw2aml0agkal9lpnvz00";
-       libraryHaskellDepends = [
-         base genvalidity path QuickCheck validity-path
-       ];
-       testHaskellDepends = [ base genvalidity-hspec hspec path ];
-       benchmarkHaskellDepends = [
-         base criterion genvalidity path QuickCheck
-       ];
-       description = "GenValidity support for Path";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-path_0_3_0_3" = callPackage
     ({ mkDerivation, base, criterion, genvalidity
      , genvalidity-criterion, genvalidity-hspec, hspec, path, QuickCheck
      , validity-path
@@ -94488,8 +94540,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events-analyze";
-       version = "0.2.6";
-       sha256 = "1xsr6wa00n2vj7bwb0sgmqrp2v45dfcindwpkf67h8inrvqydkhw";
+       version = "0.2.7";
+       sha256 = "01395ncya596fw6il2ddlziwcygvahswx0q9fjy7j7v7jqgzva3x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94790,6 +94842,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-lib-parser-ex" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath
+     , ghc-lib-parser, tasty, tasty-hunit, uniplate
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser-ex";
+       version = "8.8.2";
+       sha256 = "1651nwlja2n2z03js0plhiihms52j1663lx4wcvzm33synh6xa4j";
+       libraryHaskellDepends = [
+         base bytestring ghc-lib-parser uniplate
+       ];
+       testHaskellDepends = [
+         base directory extra filepath ghc-lib-parser tasty tasty-hunit
+       ];
+       description = "Algorithms on GHC parse trees";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-make" = callPackage
     ({ mkDerivation, base, process, shake, unordered-containers }:
      mkDerivation {
@@ -95211,8 +95281,8 @@ self: {
        pname = "ghc-syntax-highlighter";
        version = "0.0.5.0";
        sha256 = "09h911wqja56b9j9dwjqv7dlim9rm50vra1bkp8zhnlw9fa2s127";
-       revision = "1";
-       editedCabalFile = "15ykgzk8f1kslvwl645saz7q1d6iv3fk5xyri65v2gaiaih0r640";
+       revision = "2";
+       editedCabalFile = "1l95cyk6cb2bwpy4whm3kgrm7jv3kbygsssip8jj9f683lrm5gf1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ghc-lib-parser text ];
        testHaskellDepends = [ base hspec text ];
@@ -95226,27 +95296,13 @@ self: {
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.3";
-       sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
-       revision = "2";
-       editedCabalFile = "1hrbvixm25x1dx1ljy9x7f63kcan4ffz885xj6qsl8l070wj96s1";
+       version = "0.3.2";
+       sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-tcplugins-extra_0_3_1" = callPackage
-    ({ mkDerivation, base, ghc }:
-     mkDerivation {
-       pname = "ghc-tcplugins-extra";
-       version = "0.3.1";
-       sha256 = "0i9mxm8x5spf1l6vicq0kin82xdcfwdihn20b1y95cqd2qd0w8ad";
-       libraryHaskellDepends = [ base ghc ];
-       description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ghc-time-alloc-prof" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, tasty, tasty-hunit, temporary, text, time
@@ -95301,8 +95357,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.3.1";
-       sha256 = "0v29lqz6q6wsdrhbcljyvcfdz1i7bvrp341816m2n5kbrkrk48ha";
+       version = "0.3.2";
+       sha256 = "0swb3gil4760dlwyj8vrsrbwsr3jkxxyam7yy4xcih37zbk91qhv";
        libraryHaskellDepends = [
          base containers ghc ghc-prim ghc-tcplugins-extra
          ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
@@ -99555,29 +99611,6 @@ self: {
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
-    ({ mkDerivation, array, base, containers, data-accessor
-     , data-accessor-transformers, deepseq, filepath, process
-     , semigroups, temporary, time, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "gnuplot";
-       version = "0.5.6";
-       sha256 = "1g6xgnlkh17avivn1rlq7l2nvs26dvrbx4rkfld0bf6kyqaqwrgp";
-       revision = "1";
-       editedCabalFile = "15ydlmw9a6dfiy0ffxqxy7iiszbysqn2jlhxrh4lfi21ck9n15kq";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base containers data-accessor data-accessor-transformers
-         deepseq filepath process semigroups temporary time transformers
-         utility-ht
-       ];
-       description = "2D and 3D plots using gnuplot";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gnuplot_0_5_6_1" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
      , data-accessor-transformers, deepseq, filepath, process
      , semigroups, temporary, time, transformers, utility-ht
@@ -99596,7 +99629,6 @@ self: {
        ];
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnutls" = callPackage
@@ -105951,7 +105983,7 @@ self: {
        broken = true;
      }) {};
 
-  "hOpenPGP_2_9" = callPackage
+  "hOpenPGP_2_9_2" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
      , bzlib, conduit, conduit-extra, containers, criterion
@@ -105965,8 +105997,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.9";
-       sha256 = "0xdb1ggd7pw0faan8cs3hs29sqb3bgjfhxqs5x43hh1k64k3vdjk";
+       version = "2.9.2";
+       sha256 = "0bwsy00n1hpa2q2002bgy712x6jl468jyibxk0dc1k8718yndirr";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bzlib conduit conduit-extra
@@ -107182,13 +107214,13 @@ self: {
      , deepseq, directory, ed25519, extensible-exceptions, filepath
      , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network
      , network-uri, old-locale, old-time, parsec, pretty, process
-     , random, regex-compat, split, stm, tar, template-haskell, time
-     , transformers, unix, xml, zlib
+     , random, regex-compat, split, stm, tar, template-haskell, text
+     , time, transformers, unix, xml, zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.6.2";
-       sha256 = "0vgshxrnjw8jgf6vidsqcw6klv6j30nnyxlmsr9qmrjhp6bd5f0k";
+       version = "0.6.3";
+       sha256 = "1bj4jafr81xl2dvc8ym29dnp9vmbv7njaqkkfypzvm0ws09mcvh1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107196,7 +107228,7 @@ self: {
          bytestring containers cryptohash deepseq directory ed25519
          extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl
          network network-uri old-locale old-time parsec pretty process
-         random regex-compat split stm tar template-haskell time
+         random regex-compat split stm tar template-haskell text time
          transformers unix xml zlib
        ];
        testHaskellDepends = [
@@ -108118,21 +108150,19 @@ self: {
      }) {};
 
   "hakyll-dhall" = callPackage
-    ({ mkDerivation, base, binary, cborg, containers
-     , data-default-class, dhall, filepath, hakyll, lens-family-core
-     , mtl, prettyprinter, text, transformers
+    ({ mkDerivation, base, binary, containers, data-default-class
+     , dhall, filepath, hakyll, microlens, microlens-th, mtl
+     , prettyprinter, text, transformers
      }:
      mkDerivation {
        pname = "hakyll-dhall";
-       version = "0.2.3.0";
-       sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz";
-       revision = "1";
-       editedCabalFile = "1r2v4s90c3g9lhbrb9ps4za3k836brd0s41q8jimbiz7wrd0amy1";
+       version = "0.2.4.0";
+       sha256 = "0p4k3b8x4d6pgybfwy0kx9c5hlqqm57bch45j7vl421zlln7yqrx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary cborg containers data-default-class dhall filepath
-         hakyll lens-family-core mtl prettyprinter text transformers
+         base binary containers data-default-class dhall filepath hakyll
+         microlens microlens-th mtl prettyprinter text transformers
        ];
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
@@ -108351,10 +108381,10 @@ self: {
      }:
      mkDerivation {
        pname = "hal";
-       version = "0.3.0";
-       sha256 = "1mc7h9fnf75dw7ph4b2iqqvx23xw6wm0ls6c90804vdqcpjzapqh";
+       version = "0.4.1";
+       sha256 = "09wmpscvwfdy57haszwnjxwqxqqf5s458h0b1pkk90pskfg7lf1d";
        revision = "1";
-       editedCabalFile = "08pfvlqvsslfrxfk7zmvqc3b2dzar2az9l8w5mwrxv7flskzr7ii";
+       editedCabalFile = "0n5b57l3q6wpzd7kbsn11802y1mcpsrs01sszsd5l4l57hkc71gd";
        libraryHaskellDepends = [
          aeson base bytestring containers envy exceptions http-conduit
          http-types mtl text time
@@ -110274,8 +110304,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.1.1";
-       sha256 = "0h5qipq43bigjar24ibpnwlhiwgh19lf6q7miwiz1nz8yhb4rr35";
+       version = "0.0.1.2";
+       sha256 = "1bcp0v9m5miy26yfk0bm5j2zwc3rnijxlbym0iv599m25fhfqxjk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112588,15 +112618,19 @@ self: {
      }) {};
 
   "haskell-stack-trace-plugin" = callPackage
-    ({ mkDerivation, base, ghc }:
+    ({ mkDerivation, base, bytestring, ghc, hspec, hspec-discover
+     , typed-process
+     }:
      mkDerivation {
        pname = "haskell-stack-trace-plugin";
-       version = "0.1.0.0";
-       sha256 = "0rg920cc9l7vn29w10hdy68aw4jaxr64h3nxs8jb738h0n23bf50";
+       version = "0.1.1.1";
+       sha256 = "0mm1nyhlia00vawpwcq6dda0j9d8sgd1ls4xin0s84jplw5z9hwz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring hspec typed-process ];
+       testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112621,8 +112655,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-to-elm";
-       version = "0.2.0.0";
-       sha256 = "0y3ayjfspajnsk6r47fkkqafbf15f9lshgizihndrnb3smkyzgw9";
+       version = "0.2.1.0";
+       sha256 = "0a6h1hmfkwhi6yfbzb71yifmhvapbnrlwj5yp0kjp88nr1cnh69h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114353,6 +114387,8 @@ self: {
        pname = "hasktags";
        version = "0.71.2";
        sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c";
+       revision = "2";
+       editedCabalFile = "0jidvbmmj4piaxb6apwsd7jypsyjq1a1h2ziz82pc8w13yzascj3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114954,6 +114990,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_1_4_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, dlist, hashable, hashtables, loch-th, mtl
+     , placeholders, postgresql-binary, postgresql-libpq, profunctors
+     , QuickCheck, quickcheck-instances, rebase, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-builder, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "1.4.1";
+       sha256 = "0qypisbyyk9xq3g0av4vphi4k9r0jm8c16crc5wbqvalxaxrj2wc";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras dlist hashable hashtables
+         loch-th mtl placeholders postgresql-binary postgresql-libpq
+         profunctors text text-builder transformers vector
+       ];
+       testHaskellDepends = [
+         bug QuickCheck quickcheck-instances rebase rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       description = "An efficient PostgreSQL driver with a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -117279,33 +117344,6 @@ self: {
      }) {};
 
   "hedgehog" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions, fail
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text, time
-     , transformers, transformers-base, wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "1.0.1";
-       sha256 = "1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0";
-       revision = "1";
-       editedCabalFile = "0dq3ry7py2wsiwxar11zbvm3xmifm92nx4bh61lqxzmpwyyiwnxn";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions fail lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text time transformers transformers-base
-         wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers mmorph mtl pretty-show semigroups text transformers
-       ];
-       description = "Release with confidence";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_1_0_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, erf, exceptions, fail
      , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
@@ -117328,7 +117366,6 @@ self: {
        ];
        description = "Release with confidence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -117394,6 +117431,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog-corpus_0_2_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hedgehog-corpus";
+       version = "0.2.0";
+       sha256 = "194pj8mjia5v4mc0hcyxgipf15j0dr44w02r1bcf89b4b8vnk5hq";
+       libraryHaskellDepends = [ base ];
+       description = "hedgehog-corpus";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-fn" = callPackage
     ({ mkDerivation, base, contravariant, hedgehog, transformers }:
      mkDerivation {
@@ -119748,6 +119797,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hhwloc" = callPackage
+    ({ mkDerivation, base, Cabal, directory, process }:
+     mkDerivation {
+       pname = "hhwloc";
+       version = "0.2.0";
+       sha256 = "16plkwv42cbrrrl73864vcabcyd9irkbvq2jcki500vkxx92yxvj";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       description = "Bindings to https://www.open-mpi.org/projects/hwloc";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hi" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory
      , doctest, filepath, hspec, HUnit, optparse-applicative, parsec
@@ -121954,6 +122019,21 @@ self: {
        broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
+  "hlibcpuid" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hlibcpuid";
+       version = "0.2.0";
+       sha256 = "0ncsxmdcg2jr76vsja5nq39kiq7lsqm61bimspk4yk5d0z490n81";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       description = "Bindings to https://github.com/anrieff/libcpuid";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hlibev" = callPackage
     ({ mkDerivation, base, ev, network }:
      mkDerivation {
@@ -122013,23 +122093,25 @@ self: {
 
   "hlint" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
-     , containers, cpphs, data-default, directory, extra, filepath
-     , filepattern, ghc-lib-parser, haskell-src-exts
-     , haskell-src-exts-util, hscolour, mtl, process, refact, syb, text
-     , transformers, uniplate, unordered-containers, vector, yaml
+     , containers, cpphs, data-default, directory, extra, file-embed
+     , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
+     , haskell-src-exts, haskell-src-exts-util, hscolour, process
+     , refact, text, transformers, uniplate, unordered-containers
+     , utf8-string, vector, yaml
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.2.7";
-       sha256 = "0qcqpw880436n2jdil12hp071mgzvknjflkx1j01fk3hbyn4hqmx";
+       version = "2.2.8";
+       sha256 = "088wkpazj0lxx0fnzxqnfsicv59adnwzkj1rr5yjlmy4lr6sd5iz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring cmdargs containers cpphs
-         data-default directory extra filepath filepattern ghc-lib-parser
-         haskell-src-exts haskell-src-exts-util hscolour mtl process refact
-         syb text transformers uniplate unordered-containers vector yaml
+         data-default directory extra file-embed filepath filepattern
+         ghc-lib-parser ghc-lib-parser-ex haskell-src-exts
+         haskell-src-exts-util hscolour process refact text transformers
+         uniplate unordered-containers utf8-string vector yaml
        ];
        executableHaskellDepends = [ base ];
        description = "Source code suggestions";
@@ -125084,21 +125166,16 @@ self: {
      }) {};
 
   "hpath" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions
-     , hspec, HUnit, IfElse, process, QuickCheck, simple-sendfile, unix
-     , unix-bytestring, utf8-string, word8
+    ({ mkDerivation, base, bytestring, deepseq, exceptions
+     , hpath-filepath, template-haskell, utf8-string, word8
      }:
      mkDerivation {
        pname = "hpath";
-       version = "0.9.2";
-       sha256 = "1b8fni11zk3p3yx6pi9sx6cxq9vm31fqx3gm7y6nz5cykpncsx27";
+       version = "0.11.0";
+       sha256 = "07p5h68sz079rvhbz9sig4146127l29xsrphd1i3y4gskzwdvy1a";
        libraryHaskellDepends = [
-         base bytestring deepseq exceptions hspec IfElse simple-sendfile
-         unix unix-bytestring utf8-string word8
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec HUnit IfElse process QuickCheck unix
-         unix-bytestring utf8-string
+         base bytestring deepseq exceptions hpath-filepath template-haskell
+         utf8-string word8
        ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
@@ -125108,28 +125185,28 @@ self: {
     ({ mkDerivation, base, bytestring, unix, word8 }:
      mkDerivation {
        pname = "hpath-filepath";
-       version = "0.10.1";
-       sha256 = "16hrcd0qdidggsafm11x3h1b3gyqwf77bav9vyvli5mi8b5ha8n5";
+       version = "0.10.3";
+       sha256 = "0kd7qnw2bwiwqmbqkwxa15i45hjkmxvmrzblspqvfv3p3dxm8wg6";
        libraryHaskellDepends = [ base bytestring unix word8 ];
        description = "ByteString based filepath manipulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hpath-io" = callPackage
-    ({ mkDerivation, base, bytestring, hpath, hpath-filepath, hspec
-     , HUnit, IfElse, process, safe-exceptions, streamly, unix
-     , unix-bytestring, utf8-string
+    ({ mkDerivation, base, bytestring, exceptions, hpath
+     , hpath-filepath, hspec, HUnit, IfElse, process, safe-exceptions
+     , streamly, time, unix, unix-bytestring, utf8-string
      }:
      mkDerivation {
        pname = "hpath-io";
-       version = "0.10.1";
-       sha256 = "10bhgcw55xs5y58khi67y881v560x3wnp74d67d8qkk64afx36xz";
+       version = "0.12.0";
+       sha256 = "00bl6ixbnv6ld3fxnvb17wp277sn2srhia9p32mkx07ih0dwy4g2";
        libraryHaskellDepends = [
-         base bytestring hpath hpath-filepath IfElse safe-exceptions
-         streamly unix unix-bytestring utf8-string
+         base bytestring exceptions hpath hpath-filepath IfElse
+         safe-exceptions streamly time unix unix-bytestring utf8-string
        ];
        testHaskellDepends = [
-         base bytestring hpath hspec HUnit IfElse process unix
+         base bytestring hpath hspec HUnit IfElse process time unix
          unix-bytestring utf8-string
        ];
        description = "High-level IO operations on files/directories";
@@ -126184,16 +126261,28 @@ self: {
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, tagged, transformers }:
      mkDerivation {
        pname = "hs-functors";
-       version = "0.1.4.0";
-       sha256 = "0crih1v1zg0w1m4xcsz1v00j4x2w82fdd17bkhiqa1d56kx3d1af";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.1.5.0";
+       sha256 = "19mfp7vvyh65jg186kd65ycrhljb0l45a32lw92dvcdx8nbqsb7j";
+       libraryHaskellDepends = [ base tagged transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hs-functors_0_1_6_0" = callPackage
+    ({ mkDerivation, base, tagged, transformers }:
+     mkDerivation {
+       pname = "hs-functors";
+       version = "0.1.6.0";
+       sha256 = "197vyl98ddvc55dxwwjd46sdjvh1a9s5qcx2m16smn9gwmx9gq0l";
+       libraryHaskellDepends = [ base tagged transformers ];
+       description = "Functors from products of Haskell and its dual to Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-gchart" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -131683,6 +131772,26 @@ self: {
        broken = true;
      }) {};
 
+  "http-directory_0_1_7" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
+     , http-client-tls, http-date, http-types, network-uri, text, time
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "http-directory";
+       version = "0.1.7";
+       sha256 = "11vka7a049mh56fy6bi9snjkl68il9fnw583l8dw02n67wldks99";
+       libraryHaskellDepends = [
+         base bytestring html-conduit http-client http-client-tls http-date
+         http-types network-uri text time xml-conduit
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "http directory listing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "http-dispatch" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, hspec, http-client, http-client-tls, http-types
@@ -132180,6 +132289,39 @@ self: {
        broken = true;
      }) {};
 
+  "http-streams_0_8_7_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, blaze-builder, bytestring, case-insensitive
+     , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations
+     , http-common, HUnit, io-streams, lifted-base, mtl, network
+     , network-uri, openssl-streams, snap-core, snap-server
+     , system-fileio, system-filepath, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "http-streams";
+       version = "0.8.7.1";
+       sha256 = "0kl668ggxz5wzvziagw9inmmwb0l5x2r00nf4p7wm0pnl8m19l2b";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         case-insensitive directory HsOpenSSL http-common io-streams mtl
+         network network-uri openssl-streams text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
+         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
+         hspec-expectations http-common HUnit io-streams lifted-base mtl
+         network network-uri openssl-streams snap-core snap-server
+         system-fileio system-filepath text transformers
+         unordered-containers
+       ];
+       description = "An HTTP client using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "http-test" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, lens
      , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq
@@ -133015,16 +133157,17 @@ self: {
      }) {};
 
   "hurl" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, http-client
-     , http-client-tls, http-types, network-uri, text
+    ({ mkDerivation, base, base64-bytestring, bytestring, directory
+     , filepath, http-client, http-client-tls, http-types, network-uri
+     , process, text
      }:
      mkDerivation {
        pname = "hurl";
-       version = "1.0.0.0";
-       sha256 = "13yh9n7h3ihdxfi69w5jww7l9xan8yy1l4ijf198sw03sfq52k9l";
+       version = "1.1.0.0";
+       sha256 = "0l405cp4kgmm00j91p0jmkymp83bqpxhqpgkv2g5qy242c6rjfk2";
        libraryHaskellDepends = [
-         base base64-bytestring bytestring http-client http-client-tls
-         http-types network-uri text
+         base base64-bytestring bytestring directory filepath http-client
+         http-client-tls http-types network-uri process text
        ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
@@ -133633,6 +133776,33 @@ self: {
        broken = true;
      }) {};
 
+  "hw-excess_0_2_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, doctest
+     , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, QuickCheck, safe
+     , vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.2.2.2";
+       sha256 = "1iwml6il5vanx06vbn2apf1vcmimg7mw2ddqq1xy40ma7brirxsz";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base doctest doctest-discover hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-prim QuickCheck vector
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hw-prim vector
+       ];
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-fingertree" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover
      , hw-hspec-hedgehog, hw-prim
@@ -137823,6 +137993,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "incremental-parser_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.4";
+       sha256 = "0iyprnyk66zdyi21632d0aznvzk7i0hmr3idq49yjilxwck2xac4";
+       libraryHaskellDepends = [
+         base monoid-subclasses parsers rank2classes transformers
+       ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -139060,12 +139253,13 @@ self: {
      }) {};
 
   "intcode" = callPackage
-    ({ mkDerivation, base, containers, primitive }:
+    ({ mkDerivation, base, containers, doctest, primitive }:
      mkDerivation {
        pname = "intcode";
-       version = "0.2.0.0";
-       sha256 = "1lzccd70khyjw5pav5snws3m601nvq6bcn85nyd8j89lrgkxkh4y";
+       version = "0.3.0.0";
+       sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y";
        libraryHaskellDepends = [ base containers primitive ];
+       testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140234,19 +140428,18 @@ self: {
        broken = true;
      }) {};
 
-  "ip_1_7_0" = callPackage
+  "ip_1_7_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
      , bytestring, criterion, deepseq, doctest, hashable, hspec
      , hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck
-     , quickcheck-classes, small-bytearray-builder, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-short, vector, wide-word
+     , quickcheck-classes, random, small-bytearray-builder, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-short, vector
+     , wide-word
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.7.0";
-       sha256 = "18m8586ns6kijvk8wwflkhr9apki1h0gd7rkxd4w6qq66x034hk2";
-       revision = "1";
-       editedCabalFile = "1yjz4822vq22zh8mb96ccplqmm6rxrvy334n34gwyq0cfddsilr0";
+       version = "1.7.1";
+       sha256 = "0y4cbr7ci41c5m0j1cllf5hsgnplxkw4lhzxynxv5af9dhpmzak4";
        libraryHaskellDepends = [
          aeson attoparsec base byteslice bytesmith bytestring deepseq
          hashable natural-arithmetic primitive small-bytearray-builder text
@@ -140259,7 +140452,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         attoparsec base byteslice bytestring criterion text
+         attoparsec base byteslice bytestring criterion primitive random
+         text
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
@@ -142832,8 +143026,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "joint";
-       version = "0.1.3";
-       sha256 = "08hihdjxmrc2gh0bfhi7cgkl7dw6w8ib104dhggq5wpn7gk2w623";
+       version = "0.1.4";
+       sha256 = "1q1fsi5c5mzdvy7sg0abgbivmgg8dr2whxsyfhm20dy6z1hqav65";
        libraryHaskellDepends = [ base ];
        description = "Trying to compose non-composable";
        license = stdenv.lib.licenses.bsd3;
@@ -143908,6 +144102,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-syntax" = callPackage
+    ({ mkDerivation, aeson, array-builder, array-chunks, base
+     , byteslice, bytesmith, bytestring, gauge, neat-interpolation
+     , primitive, scientific, scientific-notation
+     , small-bytearray-builder, tasty, tasty-hunit, text, text-short
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-syntax";
+       version = "0.1.0.0";
+       sha256 = "1z997wqg233nrbhzimqvlmq62ywa4abk0fygbwb79h1agq67jhc1";
+       libraryHaskellDepends = [
+         array-builder array-chunks base byteslice bytesmith bytestring
+         primitive scientific-notation text-short
+       ];
+       testHaskellDepends = [
+         aeson array-chunks base byteslice bytestring neat-interpolation
+         primitive scientific scientific-notation small-bytearray-builder
+         tasty tasty-hunit text text-short unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base byteslice bytestring gauge neat-interpolation primitive
+         scientific-notation text
+       ];
+       description = "High-performance JSON parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "json-togo" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
      , bytestring, scientific, text, transformers, unordered-containers
@@ -144718,8 +144942,8 @@ self: {
      }:
      mkDerivation {
        pname = "kafka-client-sync";
-       version = "0.1.1.0";
-       sha256 = "0m8y3sinyl7f6srqk0q9yvj6f896y70zisrz4qa5qfnjik0c8ds1";
+       version = "0.1.1.1";
+       sha256 = "0gdp8aw2fg0haijpp1pa3rk3vgy2xarz8cc4lpxa74krifllyzyh";
        libraryHaskellDepends = [ base containers hw-kafka-client ];
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
@@ -148152,6 +148376,8 @@ self: {
        pname = "language-asn";
        version = "0.1.1.0";
        sha256 = "0ynqpfws2ga2v79cmlxxg1nl7w228mz9znbxj4mxpsbqyc9j25zg";
+       revision = "1";
+       editedCabalFile = "178pdynmpcg02yz9fc8gaqry2vazy5847sr0cnn8ivm554sh96fx";
        libraryHaskellDepends = [
          aeson base bytestring contravariant hashable pretty primitive text
          vector
@@ -148510,6 +148736,8 @@ self: {
        pname = "language-ecmascript";
        version = "0.19";
        sha256 = "13v5ghw8qc4paacn34skgwmvwisjaykszwjrq3lk4idzvrxln2jp";
+       revision = "2";
+       editedCabalFile = "1xj5h5ajybq4pwlw8zsn1lb920km1pcdv20apbpa7pgi39zcpzfd";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers data-default-class Diff mtl
          parsec QuickCheck template-haskell uniplate
@@ -149081,49 +149309,6 @@ self: {
      }) {};
 
   "language-puppet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , 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.6";
-       sha256 = "1gr7fkkdr66pd5fkxczjx8sjnciz09pcavcc8d1yspcc7wpv3y1q";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         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 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 scientific strict-base-types temporary text transformers
-         unordered-containers vector
-       ];
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-puppet_1_4_6_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -149164,7 +149349,6 @@ self: {
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -149816,8 +150000,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "lawz";
-       version = "0.0.1";
-       sha256 = "0djk9ca0vlilmjwr9609qrn9xy11qbpnk73yxkinwx31ib71c0kf";
+       version = "0.1";
+       sha256 = "0gnahwxkkx7nrvcbz0vcj8gzn000nhlijm7z5aiazhv08b8x4d9d";
        libraryHaskellDepends = [ base ];
        description = "Common mathematical laws";
        license = stdenv.lib.licenses.bsd3;
@@ -150472,10 +150656,8 @@ self: {
      }:
      mkDerivation {
        pname = "learn-physics";
-       version = "0.6.4";
-       sha256 = "06f1p3rcb37lh0miih2c697w8jiciby3qgjcbjagmf91svx25mm0";
-       revision = "2";
-       editedCabalFile = "0q1m0nfqjb46r2drisk4w3pggmxlx1f391lhvh8bk0z3w1ih4lmy";
+       version = "0.6.5";
+       sha256 = "0hcd03ygsq6kl08k7d8f61xm7bdzsdx6v4mplzz0c6c7sp9a40sb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150900,6 +151082,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lens-core" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bytestring
+     , Cabal, cabal-doctest, call-stack, comonad, containers, criterion
+     , deepseq, directory, doctest, dual, filepath, foldable1
+     , generic-deriving, ghc-prim, hs-functors, HUnit, mtl, nats
+     , parallel, QuickCheck, semigroups, simple-reflect, tagged
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, text, transformers, unordered-containers, util
+     , vector
+     }:
+     mkDerivation {
+       pname = "lens-core";
+       version = "0.1.0.3";
+       sha256 = "0bnjnnfavgxy600yzmhqcj91awgk420ybr8wi4pghj2pi8z0581v";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans call-stack containers dual foldable1
+         ghc-prim hs-functors mtl tagged transformers util vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+         simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "lens-datetime" = callPackage
     ({ mkDerivation, base, lens, time }:
      mkDerivation {
@@ -151737,8 +151955,8 @@ self: {
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "2.2.0.1";
-       sha256 = "0lf7l5wk7hm1s9kkr18bvcm7nqwwhbkas0ycnlk4gz4c6qwbnbz3";
+       version = "2.2.0.2";
+       sha256 = "0dblwh4gq1s7wh9hjp6481026vfcpns8ixa0vy5lhhc4r9lgkw65";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -155936,25 +156154,26 @@ self: {
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
      , criterion, data-default, directory, filepath, generic-lens, hspec
      , hspec-core, lens, mtl, process, QuickCheck, template-haskell
-     , text, time, vformat, yaml
+     , text, time, vformat, vformat-time, yaml
      }:
      mkDerivation {
        pname = "log4hs";
-       version = "0.6.0.0";
-       sha256 = "11lprcp066hxrgc7945lzprwffwkkd1sl1p3fa3qzw8xb6qi5nhz";
+       version = "0.7.0.0";
+       sha256 = "06dcnhxfy18r3jrfdsklsiqcn2zmh9pxfra1ayhrl1mljj44dmd9";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
-         generic-lens lens mtl template-haskell text time vformat yaml
+         generic-lens lens mtl template-haskell text time vformat
+         vformat-time yaml
        ];
        testHaskellDepends = [
          aeson aeson-qq base bytestring containers data-default directory
          filepath generic-lens hspec hspec-core lens mtl process QuickCheck
-         template-haskell text time vformat yaml
+         template-haskell text time vformat vformat-time yaml
        ];
        benchmarkHaskellDepends = [
          aeson aeson-qq base bytestring containers criterion data-default
          directory filepath generic-lens lens mtl template-haskell text time
-         vformat yaml
+         vformat vformat-time yaml
        ];
        description = "A python logging style log library";
        license = stdenv.lib.licenses.bsd3;
@@ -157712,8 +157931,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "0.3.1.0";
-       sha256 = "0yklxk2hqfc47lh0i347lwbnr54xk5zk2r6yqyckbaqb89k3xw0p";
+       version = "0.3.3.0";
+       sha256 = "140m7rivdrak5vcg473gp3ns54xy47k2xyv5z86z2s0ncf204ak6";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring directory hspec ];
@@ -158009,6 +158228,8 @@ self: {
        pname = "machines-attoparsec";
        version = "0";
        sha256 = "0mxm1gy7kr7czhmfwskl56wnawb2l3axfig22935bliq75mpvbs4";
+       revision = "1";
+       editedCabalFile = "1n57r25q0aajakkl7r82yw6rs9dqlhmr0qmhs7vb7ycs5i1chyis";
        libraryHaskellDepends = [
          attoparsec base bytestring machines text
        ];
@@ -158780,6 +159001,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "managed_1_0_7" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "managed";
+       version = "1.0.7";
+       sha256 = "0wxi6d3kcpc4iyhbrnbapbdgaf46aw0a8d32n2sbs0lbk0pc4c6i";
+       libraryHaskellDepends = [ base transformers ];
+       description = "A monad for managed values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "manatee" = callPackage
     ({ mkDerivation, base, binary, cairo, containers, dbus-client
      , dbus-core, derive, directory, filepath, gtk, gtk-serialized-event
@@ -159982,6 +160215,31 @@ self: {
        broken = true;
      }) {};
 
+  "massiv_0_4_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest
+     , data-default-class, deepseq, doctest, exceptions
+     , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
+     , splitmix, template-haskell, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.4.5.0";
+       sha256 = "06mllyp2wax1gbwafxa7sbda96mp4zhfsc3mbcpymxrap2i2c6w1";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions primitive
+         scheduler unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , directory, filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -160043,6 +160301,29 @@ self: {
        broken = true;
      }) {};
 
+  "massiv-test_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec
+     , massiv, primitive, QuickCheck, scheduler, unliftio, vector
+     }:
+     mkDerivation {
+       pname = "massiv-test";
+       version = "0.1.2";
+       sha256 = "13sp8xw7rbwqgafn3f5f971l9i80cm09fan27cgpx8r8nmyrmhp2";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions hspec massiv
+         primitive QuickCheck scheduler unliftio vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default deepseq genvalidity-hspec
+         hspec massiv QuickCheck scheduler vector
+       ];
+       description = "Library that contains generators, properties and tests for Massiv Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "master-plan" = callPackage
     ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
      , hspec, megaparsec, mtl, optparse-applicative, QuickCheck
@@ -160435,8 +160716,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrix-market-attoparsec";
-       version = "0.1.0.8";
-       sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay";
+       version = "0.1.1.3";
+       sha256 = "0kcjiv7qqlkqqpdv0cyrhfa81m2zxs8w06x51sj22nygr1srmdrj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
@@ -160448,26 +160729,6 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "matrix-market-attoparsec_0_1_0_9" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, directory
-     , exceptions, hspec, QuickCheck, scientific
-     }:
-     mkDerivation {
-       pname = "matrix-market-attoparsec";
-       version = "0.1.0.9";
-       sha256 = "0nfmn611x8yyw34xsz6nz7rsmc83211yydf7ic5icq5b598amg9s";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring exceptions scientific
-       ];
-       testHaskellDepends = [
-         base directory exceptions hspec QuickCheck
-       ];
-       description = "Parsing and serialization functions for the NIST Matrix Market format";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -160559,8 +160820,7 @@ self: {
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api" = callPackage
@@ -163581,8 +163841,8 @@ self: {
      }:
      mkDerivation {
        pname = "minilight";
-       version = "0.4.1";
-       sha256 = "0zx21dhnzc8p0x6v827178rl2s215gik705fggmg31hqhwkzfy4c";
+       version = "0.4.2";
+       sha256 = "0bs4ix1yazq660jn9yz3yyfxx6scj2dgy37n13461l7ax1y9xp7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164151,6 +164411,8 @@ self: {
        pname = "miss-porcelain";
        version = "0";
        sha256 = "192hxmq5j5wl6njvay0192r5gqlbjahgqd8v6ndhb53yrg7ckjmc";
+       revision = "1";
+       editedCabalFile = "11n8hllv5xgrqw1j4wbpfyld4mpmi11axfwq5nfc2lkdfdaznyql";
        libraryHaskellDepends = [
          base bytestring containers filesystem-abstractions list-tries miss
          mtl posix-paths
@@ -164589,21 +164851,21 @@ self: {
 
   "mmsyn7h" = callPackage
     ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
-     , mmsyn6ukr, mmsyn7s, process, vector
+     , mmsyn6ukr, mmsyn7s, mmsyn7ukr, process, vector
      }:
      mkDerivation {
        pname = "mmsyn7h";
-       version = "0.5.1.0";
-       sha256 = "0hrkk5fnknjb6871frf6g2j896vbbbyhhxph4ay3f82s4vyh4zvs";
+       version = "0.6.1.0";
+       sha256 = "0gjcfv60wapq3cwxic0p8kp9nm1jh67br8sdqh35dh6ycc9c77fi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s process
-         vector
+         base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr
+         process vector
        ];
        executableHaskellDepends = [
-         base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s process
-         vector
+         base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr
+         process vector
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
        license = stdenv.lib.licenses.mit;
@@ -164651,8 +164913,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7ukr";
-       version = "0.6.3.0";
-       sha256 = "1q831acj5a3c0dxlhy2gqci2925p6szz29c90q0nfs8psp58lz42";
+       version = "0.9.3.0";
+       sha256 = "1qqr5zkzs03bhj6gmld60j5sxrhw2myiy8aip4svs2xyz3f8wp04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167021,16 +167283,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monoid-subclasses_1_0" = callPackage
+  "monoid-subclasses_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "1.0";
-       sha256 = "1n7hd6whfr4gspads1frml4mbjmshyf9h42f57icz4ps3h1dzd1r";
-       revision = "1";
-       editedCabalFile = "1d0mxmix206k4qxcprqvm0fk28p9x23dyr227fv94p8gyrf04zak";
+       version = "1.0.1";
+       sha256 = "16ypv15brywq8s403v0c586py3pw2gii8z2i91l71qjq95ii8b53";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -167396,26 +167656,26 @@ self: {
      , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt
      , quickcheck-instances, show-type, singletons, spoon, syb, tasty
      , tasty-ant-xml, tasty-discover, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time, timerep
-     , transformers-compat, unordered-containers, vector, vinyl
-     , wl-pprint-text
+     , tasty-quickcheck, template-haskell, text, th-lift
+     , th-lift-instances, time, timerep, transformers-compat, type-spec
+     , unordered-containers, vector, vinyl, wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "0.5.0";
-       sha256 = "0p84m66iklsqs8hhz33755lrqrjmp7xc9x62qbqj5bdg9mfi6kl2";
+       version = "0.6.0";
+       sha256 = "0pp771h03k0xfcpddxg0s865cl8jqk2gv29mfng6c6hvbmbwy381";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-options aeson-pretty base-noprelude base16-bytestring
          base58-bytestring bimap binary bytestring constraints containers
          cryptonite data-default first-class-families fmt formatting
-         ghc-prim gitrev hex-text hspec interpolate lens megaparsec memory
-         morley-prelude mtl named parser-combinators pretty-terminal
+         ghc-prim gitrev hex-text hspec HUnit interpolate lens megaparsec
+         memory morley-prelude mtl named parser-combinators pretty-terminal
          QuickCheck quickcheck-arbitrary-adt quickcheck-instances show-type
          singletons syb tasty tasty-ant-xml tasty-hunit template-haskell
-         text time timerep transformers-compat unordered-containers vector
-         vinyl wl-pprint-text
+         text th-lift th-lift-instances time timerep transformers-compat
+         unordered-containers vector vinyl wl-pprint-text
        ];
        executableHaskellDepends = [
          base-noprelude fmt morley-prelude named optparse-applicative
@@ -167423,10 +167683,11 @@ self: {
        ];
        testHaskellDepends = [
          aeson base-noprelude bimap bytestring constraints containers
-         data-default directory filepath fmt formatting hex-text hspec
-         hspec-expectations HUnit lens megaparsec morley-prelude QuickCheck
-         quickcheck-arbitrary-adt quickcheck-instances singletons spoon syb
-         tasty tasty-hspec tasty-quickcheck text unordered-containers vinyl
+         data-default directory filepath first-class-families fmt formatting
+         hex-text hspec hspec-expectations HUnit lens megaparsec
+         morley-prelude QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons spoon syb tasty tasty-hspec
+         tasty-quickcheck text type-spec unordered-containers vinyl
        ];
        testToolDepends = [ tasty-discover ];
        description = "Developer tools for the Michelson Language";
@@ -169881,8 +170142,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicScroll";
-       version = "0.1.0.0";
-       sha256 = "1k0di4xiv1jbfdcbwgqf3cn71fn8351lhhd82nv9cj6h3pmphxvd";
+       version = "0.1.1.0";
+       sha256 = "0f1i3ys1pfylb5igqwkap0k7v47a2c5vfnhc2flxw9h6aim8yh6h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -170061,6 +170322,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mutable" = callPackage
+    ({ mkDerivation, base, constraints, criterion, deepseq, directory
+     , generic-lens, microlens, microlens-th, primitive, reflection
+     , time, transformers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "mutable";
+       version = "0.1.0.0";
+       sha256 = "1z231r8ngwhdr5znw2kxg6ldsasr8iyki0wwyg1s24d505xadnry";
+       libraryHaskellDepends = [
+         base constraints generic-lens primitive reflection transformers
+         vector vinyl
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory microlens microlens-th time
+         transformers vector vinyl
+       ];
+       description = "Automatic piecewise-mutable references for your types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "mutable-containers" = callPackage
     ({ mkDerivation, base, containers, gauge, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
@@ -171505,8 +171789,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "natural-arithmetic";
-       version = "0.1.1.0";
-       sha256 = "0n2330b2g4gy1ljpcww9vmj74ig23m0zxkg92721zpdfywlcy44g";
+       version = "0.1.2.0";
+       sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0";
        libraryHaskellDepends = [ base ];
        description = "Arithmetic of natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -172973,6 +173257,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-byte-order_0_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, doctest }:
+     mkDerivation {
+       pname = "network-byte-order";
+       version = "0.1.3.0";
+       sha256 = "1kp4hgbq69b85m978ambmk8jil3maddfirivzr56zj01zh9m52z3";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring doctest ];
+       description = "Network byte order utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, network, unix }:
      mkDerivation {
@@ -179337,24 +179634,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, Only, optparse-applicative
-     , semigroups, system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.3.0";
-       sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0";
-       revision = "3";
-       editedCabalFile = "0vszcjmxywblx5z9yvrz8c6yc104jgr1nv0sbv58ansd3rkjlzfn";
-       libraryHaskellDepends = [
-         base bytestring Only optparse-applicative semigroups
-         system-filepath text time transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_3_1" = callPackage
     ({ mkDerivation, base, bytestring, Only, optparse-applicative
      , semigroups, system-filepath, text, time, transformers, void
      }:
@@ -179368,7 +179647,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -179812,8 +180090,8 @@ self: {
      }:
      mkDerivation {
        pname = "ormolu";
-       version = "0.0.3.0";
-       sha256 = "04s48k3w4lgi682q8cllhmmawffl2781hi462gkcjr18kx46swx1";
+       version = "0.0.3.1";
+       sha256 = "0pvnswbxi09fddnn012sha3fbmm30yzlzh2x1asw9ahjk3a3bdlg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -181219,8 +181497,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-plantuml-diagrams";
-       version = "0.1.0.3";
-       sha256 = "1l3rp09b7824dlsbcj0hn6g0rb4bhdc9788vlfn0lgr887iy1sq8";
+       version = "0.1.0.4";
+       sha256 = "1fshgv5wl56z3w0yimwv5dbi7dal600anb5wkxd5n3jlpmp8fwky";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181228,7 +181506,8 @@ self: {
        ];
        executableHaskellDepends = [ base pandoc-types ];
        testHaskellDepends = [
-         base hspec hspec-discover mtl pandoc-types SHA utf8-string
+         base bytestring directory hspec hspec-discover mtl pandoc-types
+         process SHA utf8-string
        ];
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
@@ -181237,6 +181516,37 @@ self: {
        broken = true;
      }) {};
 
+  "pandoc-plot" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, deepseq
+     , directory, filepath, hashable, hspec, hspec-expectations, mtl
+     , open-browser, optparse-applicative, pandoc, pandoc-types
+     , parallel-io, shakespeare, tasty, tasty-hspec, tasty-hunit
+     , template-haskell, temporary, text, turtle, typed-process, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-plot";
+       version = "0.2.1.0";
+       sha256 = "1q5ai86bmxdx1vw0wmp1gbg3sd4ys4gq58hivri5nz3ggfjdvy3b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default-class directory filepath hashable mtl
+         pandoc pandoc-types parallel-io shakespeare temporary text turtle
+         typed-process yaml
+       ];
+       executableHaskellDepends = [
+         base data-default-class deepseq directory filepath open-browser
+         optparse-applicative pandoc pandoc-types template-haskell temporary
+         text
+       ];
+       testHaskellDepends = [
+         base data-default-class directory filepath hspec hspec-expectations
+         mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text
+       ];
+       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "pandoc-pyplot" = callPackage
     ({ mkDerivation, base, containers, data-default-class, deepseq
      , directory, filepath, hashable, hspec, hspec-expectations
@@ -183313,22 +183623,6 @@ self: {
      }) {};
 
   "password" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, quickcheck-instances
-     , scrypt, text
-     }:
-     mkDerivation {
-       pname = "password";
-       version = "0.1.0.0";
-       sha256 = "097zpb3brl7qib2a7di4y5lpkgzyqanhcyfchpf1xng199k2bwp3";
-       libraryHaskellDepends = [ base scrypt text ];
-       testHaskellDepends = [
-         base doctest QuickCheck quickcheck-instances
-       ];
-       description = "plain-text password and hashed password datatypes and functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "password_0_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, doctest, QuickCheck
      , quickcheck-instances, scrypt, text
      }:
@@ -183342,28 +183636,9 @@ self: {
        ];
        description = "plain-text password and hashed password datatypes and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "password-instances" = callPackage
-    ({ mkDerivation, aeson, base, doctest, http-api-data, password
-     , persistent, QuickCheck, quickcheck-instances
-     }:
-     mkDerivation {
-       pname = "password-instances";
-       version = "0.3.0.0";
-       sha256 = "1ll5c9dpw23v4r3zf3v7rc6y5cjh55myjdg5mvyi1d5kb95pbwp9";
-       libraryHaskellDepends = [
-         aeson base http-api-data password persistent
-       ];
-       testHaskellDepends = [
-         base doctest QuickCheck quickcheck-instances
-       ];
-       description = "typeclass instances for password package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "password-instances_0_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, doctest, http-api-data, password
      , persistent, QuickCheck, quickcheck-instances
      }:
@@ -183379,7 +183654,6 @@ self: {
        ];
        description = "typeclass instances for password package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passwords" = callPackage
@@ -183451,8 +183725,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.8.4.0";
-       sha256 = "0yq3y5qbc4mr0vmy26v6rf7h6jc2hlgf7kgdp0i69ill0xlkdasx";
+       version = "0.8.4.3";
+       sha256 = "1zz007l9ap9qlhgwr7jjavr6h5r1cnr9wflyxpvjmdzmn6ch74w4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183474,15 +183748,15 @@ self: {
   "patch" = callPackage
     ({ mkDerivation, base, constraints-extras, containers
      , dependent-map, dependent-sum, directory, filemanip, filepath
-     , hlint, monoidal-containers, semialign, semigroupoids, these
+     , hlint, lens, monoidal-containers, semialign, semigroupoids, these
      , transformers, witherable
      }:
      mkDerivation {
        pname = "patch";
-       version = "0.0.1.0";
-       sha256 = "1mhf5fbchq2r42xalmr5l29nc373p1kw8lxm71bphibkq95y0qlc";
+       version = "0.0.2.0";
+       sha256 = "0c9wf996k8py90ld6353hynb96fdird7lm4kx3djaild6iiyiaal";
        libraryHaskellDepends = [
-         base constraints-extras containers dependent-map dependent-sum
+         base constraints-extras containers dependent-map dependent-sum lens
          monoidal-containers semialign semigroupoids these transformers
          witherable
        ];
@@ -189490,6 +189764,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "plucky" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "plucky";
+       version = "0.0.0.1";
+       sha256 = "11v1zhhgvzmhlk5vnr7lhw8gb2w5gvs4wwvkynj9lxbv96a8yb5s";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base mtl ];
+       description = "A library and technique for handling errors via plucking constraints";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plugins" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-prim, haskell-src, process, random
@@ -191782,29 +192068,6 @@ self: {
      }) {};
 
   "postgresql-simple-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-migration";
-       version = "0.1.14.0";
-       sha256 = "1z9fdfwpcnhbsq977070hn8ykxcnisjzvpdh5lz4bqirscx2gr2c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
-       ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple text time
-       ];
-       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple-migration_0_1_15_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
@@ -191825,7 +192088,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-named" = callPackage
@@ -192474,6 +192736,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pprecord" = callPackage
+    ({ mkDerivation, base, boxes }:
+     mkDerivation {
+       pname = "pprecord";
+       version = "0.2.0.0";
+       sha256 = "1gpr6sndh3pc43f1aks7wq8h969bbj2rc01rvaq9pkdnwqlqr7r4";
+       libraryHaskellDepends = [ base boxes ];
+       description = "A library for pretty printing Records";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pptable" = callPackage
     ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit
      , markdown-unlit, pretty, QuickCheck, syb, tasty, tasty-hunit
@@ -193505,25 +193778,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "prettyprinter_1_5_1" = callPackage
+  "prettyprinter_1_6_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
-     , containers, criterion, deepseq, doctest, mtl, pgp-wordlist
-     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
+     , containers, deepseq, doctest, gauge, mtl, pgp-wordlist
+     , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1.5.1";
-       sha256 = "151p75gkbmjfjb4bw14xxpka6i44x14hpbxxdbrsfsnlrncb8rpv";
+       version = "1.6.0";
+       sha256 = "1xgjymlv5kfiqk6i2p8qc406xn8xphis7hhsdzcw6lpqmyp8bapx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
-         base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
+         base bytestring doctest pgp-wordlist QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [
-         ansi-wl-pprint base base-compat containers criterion deepseq mtl
+         ansi-wl-pprint base base-compat containers deepseq gauge mtl
          QuickCheck random text transformers
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
@@ -194041,12 +194314,12 @@ self: {
      }) {};
 
   "primitive-unlifted" = callPackage
-    ({ mkDerivation, base, primitive, stm }:
+    ({ mkDerivation, base, bytestring, primitive, stm, text-short }:
      mkDerivation {
        pname = "primitive-unlifted";
-       version = "0.1.2.0";
-       sha256 = "1zq5fx032shxsk23hlyj9js8jdbg4r17l0gigsrbrnlajnwk4683";
-       libraryHaskellDepends = [ base primitive ];
+       version = "0.1.3.0";
+       sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih";
+       libraryHaskellDepends = [ base bytestring primitive text-short ];
        testHaskellDepends = [ base primitive stm ];
        description = "Primitive GHC types with unlifted types inside";
        license = stdenv.lib.licenses.bsd3;
@@ -196982,31 +197255,6 @@ self: {
      }) {};
 
   "pure-zlib" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring
-     , bytestring-builder, containers, filepath, fingertree, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "pure-zlib";
-       version = "0.6.6";
-       sha256 = "1fby7dj8yp8yqycxzl1dr4s6i0isnx24zxbcan672wwrhdxh9s6y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base base-compat bytestring bytestring-builder containers
-         fingertree
-       ];
-       executableHaskellDepends = [ base base-compat bytestring ];
-       testHaskellDepends = [
-         base base-compat bytestring filepath HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base base-compat bytestring time ];
-       description = "A Haskell-only implementation of zlib / DEFLATE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pure-zlib_0_6_7" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , bytestring-builder, containers, filepath, fingertree, HUnit
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
@@ -197029,7 +197277,6 @@ self: {
        benchmarkHaskellDepends = [ base base-compat bytestring time ];
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pureMD5" = callPackage
@@ -197098,8 +197345,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.13.5";
-       sha256 = "0plqzlcfaw2ik2im7aq8yy1b1y88cnc8qd7wwaayndbdz060s9j4";
+       version = "0.13.6";
+       sha256 = "1xss3wpv6wb38gsh9r635s09cxzmiz81hhssdxzdba2pw6ifzx8j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200726,6 +200973,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rank2classes_1_3_2_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
+     , markdown-unlit, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.3.2.1";
+       sha256 = "1sh2ks4qj3ksqs92rm8xzanpwc5ppml04s4mjzyngpgrihwi9924";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -203268,32 +203537,33 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, constraints-extras
-     , containers, criterion, data-default, deepseq, dependent-map
-     , dependent-sum, directory, exception-transformers, filemanip
-     , filepath, haskell-src-exts, haskell-src-meta, hlint, lens
-     , loch-th, MemoTrie, monad-control, monoidal-containers, mtl
-     , prim-uniq, primitive, process, profunctors, random, ref-tf
-     , reflection, semialign, semigroupoids, split, stm, syb
-     , template-haskell, these, these-lens, time, transformers
-     , unbounded-delays, witherable
+    ({ mkDerivation, base, bifunctors, comonad, constraints
+     , constraints-extras, containers, criterion, data-default, deepseq
+     , dependent-map, dependent-sum, directory, exception-transformers
+     , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint
+     , hspec, lens, loch-th, MemoTrie, monad-control
+     , monoidal-containers, mtl, patch, prim-uniq, primitive, process
+     , proctest, profunctors, random, ref-tf, reflection, semialign
+     , semigroupoids, split, stm, syb, template-haskell, text, these
+     , these-lens, time, transformers, unbounded-delays, witherable
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.6.3";
-       sha256 = "0nrmc86dinkxvfyj1wh57g816hzqxs583ipaqiq9gipadsa2jgcs";
+       version = "0.6.4";
+       sha256 = "162gjk11z6yjdwnb7y9xhg6h851wxssz9zb548h52hdld9vdfkcf";
        libraryHaskellDepends = [
          base bifunctors comonad constraints-extras containers data-default
          dependent-map dependent-sum exception-transformers haskell-src-exts
          haskell-src-meta lens MemoTrie monad-control monoidal-containers
-         mtl prim-uniq primitive profunctors random ref-tf reflection
+         mtl patch prim-uniq primitive profunctors random ref-tf reflection
          semialign semigroupoids stm syb template-haskell these time
          transformers unbounded-delays witherable
        ];
        testHaskellDepends = [
-         base bifunctors containers deepseq dependent-map dependent-sum
-         directory filemanip filepath hlint lens monoidal-containers mtl
-         ref-tf semialign split these these-lens transformers
+         base bifunctors constraints constraints-extras containers deepseq
+         dependent-map dependent-sum directory filemanip filepath hlint
+         hspec lens monoidal-containers mtl patch proctest ref-tf semialign
+         split text these these-lens transformers witherable
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq dependent-map dependent-sum
@@ -203558,12 +203828,16 @@ self: {
      }) {};
 
   "reflex-fsnotify" = callPackage
-    ({ mkDerivation, base, fsnotify, reflex }:
+    ({ mkDerivation, base, containers, directory, filepath, fsnotify
+     , reflex
+     }:
      mkDerivation {
        pname = "reflex-fsnotify";
-       version = "0.1.0.0";
-       sha256 = "1rj1mk5i3a74i5wjwqwbh5546vjqw97laswg4lkiihkq9w20dlry";
-       libraryHaskellDepends = [ base fsnotify reflex ];
+       version = "0.2.0.0";
+       sha256 = "0nxi3zjwwq36212qncpxi7rn30lgh0zy4swz10wxm55zb480dm8m";
+       libraryHaskellDepends = [
+         base containers directory filepath fsnotify reflex
+       ];
        description = "reflex-frp interface for watching files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203577,8 +203851,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-ghci";
-       version = "0.1.2.0";
-       sha256 = "13wilfk6d8s201jyifm1ynw8d9ziizaldhg8g9vjvj0j9sxiv1ma";
+       version = "0.1.3.1";
+       sha256 = "0z4bw7dk5ccxydraj7n2j9hvclm8zi7y2k5mmssq1acr3wfsxq2h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203700,8 +203974,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-process";
-       version = "0.1.0.1";
-       sha256 = "0v7xiax45ax2z6w0b4sprc171pv9fkbld7warmk0phwr3sfzb9ai";
+       version = "0.2.0.0";
+       sha256 = "0vj4kr8p7r4jc7xl62vd3zk29q2bikgq9fgcgkwbi8fxcfwy94cr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206104,6 +206378,8 @@ self: {
        pname = "repline";
        version = "0.2.2.0";
        sha256 = "06f5df05j295v84j5c4k8bffwkpmrncbz4kpw4sh1pjszp1yv4d1";
+       revision = "1";
+       editedCabalFile = "1x4f1cbn9ylg82h853mqhm0sda6lz76ssk45d0x842pjbn3y46xx";
        libraryHaskellDepends = [
          base containers exceptions haskeline mtl process
        ];
@@ -208083,31 +208359,6 @@ self: {
      }) {};
 
   "rio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
-     , process, QuickCheck, text, time, typed-process, unix, unliftio
-     , unliftio-core, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rio";
-       version = "0.1.12.0";
-       sha256 = "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable microlens mtl primitive process text time typed-process
-         unix unliftio unliftio-core unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable hspec microlens mtl primitive process QuickCheck text time
-         typed-process unix unliftio unliftio-core unordered-containers
-         vector
-       ];
-       description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rio_0_1_13_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
      , process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -208130,7 +208381,6 @@ self: {
        ];
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rio-orphans" = callPackage
@@ -211923,8 +212173,8 @@ self: {
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.6.0";
-       sha256 = "0jbrfcgljl8kbcwi2zqx1jp3c3dpxrkc94za44x56kcz68n89hlz";
+       version = "0.6.1";
+       sha256 = "0cq9zslaqcs1vq85xznc11vis5bkvmhjsnwxrc2p01bsxbvwxsh6";
        libraryHaskellDepends = [
          base bytestring case-insensitive data-default http-client
          http-client-tls scalpel-core tagsoup text
@@ -211940,8 +212190,8 @@ self: {
      }:
      mkDerivation {
        pname = "scalpel-core";
-       version = "0.6.0";
-       sha256 = "1qf0gnidyh8zk0acj99vn6hsj37m410lrm50sqpiv1i36rpmmsqh";
+       version = "0.6.1";
+       sha256 = "199g005ps5grjj3y7mxajck3ybyc60fs72p8jk859ji3svpqdfyn";
        libraryHaskellDepends = [
          base bytestring containers data-default fail pointedlist regex-base
          regex-tdfa tagsoup text vector
@@ -213763,31 +214013,6 @@ self: {
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
-     , entropy, hashable, hspec, hspec-discover, HUnit, libsecp256k1
-     , mtl, QuickCheck, string-conversions
-     }:
-     mkDerivation {
-       pname = "secp256k1-haskell";
-       version = "0.1.6";
-       sha256 = "1xasiii9g6ypn9y89q7ramkgz7vx87fr21qqbh1657my4aaipv03";
-       libraryHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy hashable
-         QuickCheck string-conversions
-       ];
-       libraryPkgconfigDepends = [ libsecp256k1 ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy hashable hspec
-         HUnit mtl QuickCheck string-conversions
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bindings for secp256k1 library from Bitcoin Core";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {libsecp256k1 = null;};
-
-  "secp256k1-haskell_0_1_8" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, cereal
      , deepseq, entropy, hashable, hspec, hspec-discover, HUnit
      , libsecp256k1, mtl, QuickCheck, string-conversions
@@ -213968,14 +214193,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "selda_0_5_0_0" = callPackage
+  "selda_0_5_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
      , random, text, time, uuid-types
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.5.0.0";
-       sha256 = "1dsyc69fvqqhq9a9n97dnp81vvxxpf4dg4f5yan3fdr7zn9qgx3f";
+       version = "0.5.1.0";
+       sha256 = "1gd7fdgqw6q507wn7h1pln9wb7kh65vd7iv0s1ydg54r36qdlrgl";
        libraryHaskellDepends = [
          base bytestring containers exceptions mtl random text time
          uuid-types
@@ -214014,6 +214239,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-postgresql_0_1_8_1" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
+     , postgresql-libpq, selda, selda-json, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "selda-postgresql";
+       version = "0.1.8.1";
+       sha256 = "0dxycilvxjbi1cy9c0rzq9ywh48i2lh37j77a5i1x6v1625h51mk";
+       libraryHaskellDepends = [
+         base bytestring exceptions postgresql-binary postgresql-libpq selda
+         selda-json text time uuid-types
+       ];
+       description = "PostgreSQL backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-sqlite" = callPackage
     ({ mkDerivation, base, bytestring, direct-sqlite, directory
      , exceptions, selda, text, time, uuid-types
@@ -214032,6 +214274,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-sqlite_0_1_7_1" = callPackage
+    ({ mkDerivation, base, bytestring, direct-sqlite, directory
+     , exceptions, selda, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "selda-sqlite";
+       version = "0.1.7.1";
+       sha256 = "1a1rik32h8ijd98v98db1il10ap76rqdwmjwhj0hc0h77mm6qdfb";
+       libraryHaskellDepends = [
+         base bytestring direct-sqlite directory exceptions selda text time
+         uuid-types
+       ];
+       description = "SQLite backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "select" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215326,6 +215585,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant_0_17" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
+     , bytestring, case-insensitive, deepseq, hspec, hspec-discover
+     , http-api-data, http-media, http-types, mmorph, mtl, network-uri
+     , QuickCheck, quickcheck-instances, singleton-bool
+     , string-conversions, tagged, text, transformers, vault
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.17";
+       sha256 = "0hrqwb9cin6wbwwqaw68i84ai46897ir4gy4issc6ya2qqmfq1ks";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bifunctors bytestring
+         case-insensitive deepseq http-api-data http-media http-types mmorph
+         mtl network-uri QuickCheck singleton-bool string-conversions tagged
+         text transformers vault
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring hspec http-media mtl QuickCheck
+         quickcheck-instances string-conversions text transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-JuicyPixels" = callPackage
     ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
      , servant-server, wai, warp
@@ -215725,8 +216011,8 @@ self: {
        pname = "servant-blaze";
        version = "0.9";
        sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r";
-       revision = "2";
-       editedCabalFile = "0icqk00h03d6slfha8ylb07jj69y4chnhczxk8zskvgc89f6jl97";
+       revision = "3";
+       editedCabalFile = "0pn9ca2jmx71clz0j9nlz1lwmr2xv39zqfda10al11am9mc4j8n4";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
@@ -215741,8 +216027,8 @@ self: {
        pname = "servant-cassava";
        version = "0.10";
        sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
-       revision = "6";
-       editedCabalFile = "17d6phknxh5cqslwcj3a4gfhsgm8bw4bf7mlpmfrrc6izwnm1q8v";
+       revision = "7";
+       editedCabalFile = "0n4nbm0axa9qd805jb3gja2p2fiwvhjpvdi5rhlwh4shm9crppcy";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -215889,6 +216175,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client_0_17" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , deepseq, entropy, exceptions, hspec, hspec-discover
+     , http-api-data, http-client, http-media, http-types, HUnit
+     , kan-extensions, markdown-unlit, monad-control, mtl, network
+     , QuickCheck, semigroupoids, servant, servant-client-core
+     , servant-server, stm, tdigest, text, time, transformers
+     , transformers-base, transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.17";
+       sha256 = "0161v6kfj4mm5rixw5lbm8sc2dng300xbwgdhi4d0fqxrx12kij7";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers deepseq exceptions
+         http-client http-media http-types kan-extensions monad-control mtl
+         semigroupoids servant servant-client-core stm text time
+         transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring entropy hspec http-api-data
+         http-client http-types HUnit kan-extensions markdown-unlit mtl
+         network QuickCheck servant servant-client-core servant-server stm
+         tdigest text transformers transformers-compat wai warp
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "Automatic derivation of querying functions for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client-core" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, deepseq, exceptions, free, hspec
@@ -215912,6 +216229,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client-core_0_17" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, containers, deepseq, exceptions, free, hspec
+     , hspec-discover, http-media, http-types, network-uri, QuickCheck
+     , safe, servant, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "servant-client-core";
+       version = "0.17";
+       sha256 = "1xskvmdr4998hj19wvhyb5rs5x193792f1b6ia7r21qdzp9garff";
+       libraryHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring containers
+         deepseq exceptions free http-media http-types network-uri safe
+         servant template-haskell text transformers
+       ];
+       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Core functionality and class for client function generation for servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client-namedargs" = callPackage
     ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck
      , servant, servant-client, servant-client-core, servant-namedargs
@@ -215944,8 +216283,8 @@ self: {
        pname = "servant-conduit";
        version = "0.15";
        sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz";
-       revision = "2";
-       editedCabalFile = "1m5h5kwc9bjpc7ppdsxx8rr4906bl08np1kawzfvpr7qqy4s8j4q";
+       revision = "3";
+       editedCabalFile = "0adximf4hg3bf7d9mkcjdsp5klg787ryb1hy3j49fg39l1rszac4";
        libraryHaskellDepends = [
          base bytestring conduit mtl resourcet servant unliftio-core
        ];
@@ -216019,18 +216358,16 @@ self: {
      }) {};
 
   "servant-dhall" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, dhall, http-media
-     , megaparsec, prettyprinter, servant, servant-server, text, wai
-     , warp
+    ({ mkDerivation, base, base-compat, bytestring, dhall, either
+     , http-media, megaparsec, prettyprinter, servant, servant-server
+     , text, wai, warp
      }:
      mkDerivation {
        pname = "servant-dhall";
-       version = "0.1.0.2";
-       sha256 = "09fvyhkqpypg73cxs7y2asvlch83i4sqzh2w0d5ix0zl5i7f6rz3";
-       revision = "1";
-       editedCabalFile = "19jdp0xj1nl21wzfnk2y3qrzi7cag1m3wk0zqvqayc2czq9h0k08";
+       version = "0.3";
+       sha256 = "0xvzm1majfjigwpcy6sqbzvpirinhac4lh6f32cy2qkkk6xq09mz";
        libraryHaskellDepends = [
-         base base-compat bytestring dhall http-media megaparsec
+         base base-compat bytestring dhall either http-media megaparsec
          prettyprinter servant text
        ];
        testHaskellDepends = [
@@ -216071,6 +216408,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-docs_0_11_5" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+     , case-insensitive, hashable, http-media, http-types, lens, servant
+     , string-conversions, tasty, tasty-golden, tasty-hunit, text
+     , transformers, universe-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-docs";
+       version = "0.11.5";
+       sha256 = "0i51f33w5bz8j6jj9j5ivg7kll510nc0hmkhdrh3q0qagbpwryfx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat bytestring case-insensitive
+         hashable http-media http-types lens servant string-conversions text
+         universe-base unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base lens servant string-conversions text
+       ];
+       testHaskellDepends = [
+         aeson base base-compat lens servant string-conversions tasty
+         tasty-golden tasty-hunit transformers
+       ];
+       description = "generate API docs for your servant webservice";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-ede" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
      , http-media, http-types, semigroups, servant, servant-server, text
@@ -216102,8 +216468,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-ekg";
-       version = "0.3";
-       sha256 = "0kqsvpqh36ripps7lvqlg5d407yhh3rzccgyn8zkbrir0ifjfy2l";
+       version = "0.3.1";
+       sha256 = "1vfj5qkajqs2rfhz3yyljy6jj4m80fb2zslrrg0a5126hhbaglss";
        libraryHaskellDepends = [
          base ekg-core hashable http-types servant text time
          unordered-containers wai
@@ -216273,6 +216639,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-foreign_0_15_1" = callPackage
+    ({ mkDerivation, base, base-compat, hspec, hspec-discover
+     , http-types, lens, servant, text
+     }:
+     mkDerivation {
+       pname = "servant-foreign";
+       version = "0.15.1";
+       sha256 = "024pd3a5pf4gqx5y2is7n38a7qyfanw13w5jy4j5a81zjmfxnwk7";
+       libraryHaskellDepends = [
+         base base-compat http-types lens servant text
+       ];
+       testHaskellDepends = [ base hspec servant ];
+       testToolDepends = [ hspec-discover ];
+       description = "Helpers for generating clients for servant APIs in any programming language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-generate" = callPackage
     ({ mkDerivation, base, servant, servant-server }:
      mkDerivation {
@@ -216445,6 +216829,41 @@ self: {
        broken = true;
      }) {};
 
+  "servant-http-streams_0_17" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring
+     , case-insensitive, containers, deepseq, entropy, exceptions, hspec
+     , hspec-discover, http-api-data, http-common, http-media
+     , http-streams, http-types, HUnit, io-streams, kan-extensions
+     , markdown-unlit, monad-control, mtl, network, QuickCheck
+     , semigroupoids, servant, servant-client-core, servant-server, stm
+     , tdigest, text, time, transformers, transformers-base
+     , transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-http-streams";
+       version = "0.17";
+       sha256 = "1nyp6ijb8219yfbxrq2mz59m1vfpr56rbfn9j9zmx4pcvnb903xc";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive containers deepseq
+         exceptions http-common http-media http-streams http-types
+         io-streams kan-extensions monad-control mtl semigroupoids servant
+         servant-client-core text time transformers transformers-base
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring deepseq entropy hspec
+         http-api-data http-streams http-types HUnit kan-extensions
+         markdown-unlit mtl network QuickCheck servant servant-client-core
+         servant-server stm tdigest text transformers transformers-compat
+         wai warp
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "Automatic derivation of querying functions for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "servant-http2-client" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring
      , case-insensitive, containers, data-default-class, exceptions
@@ -216534,6 +216953,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-js_0_9_4_1" = callPackage
+    ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
+     , hspec-expectations, language-ecmascript, lens, QuickCheck
+     , servant, servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-js";
+       version = "0.9.4.1";
+       sha256 = "004snd07q29g08smvrwmpypg75g9rxdvk5bfyfyxxmj47wh4734d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat charset lens servant servant-foreign text
+       ];
+       testHaskellDepends = [
+         base base-compat hspec hspec-expectations language-ecmascript lens
+         QuickCheck servant text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Automatically derive javascript functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-jsonrpc" = callPackage
     ({ mkDerivation, aeson, base, servant }:
      mkDerivation {
@@ -216616,6 +217059,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-lucid_0_9_0_1" = callPackage
+    ({ mkDerivation, base, http-media, lucid, servant, servant-server
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-lucid";
+       version = "0.9.0.1";
+       sha256 = "1jhs9qy36vccy90s24cd9bmhqs604xqd9m8a4fbkjxrcpgdzfjgq";
+       libraryHaskellDepends = [ base http-media lucid servant text ];
+       testHaskellDepends = [ base lucid servant-server wai warp ];
+       description = "Servant support for lucid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-machines" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, http-client
      , http-media, machines, mtl, servant, servant-client
@@ -216625,8 +217083,8 @@ self: {
        pname = "servant-machines";
        version = "0.15";
        sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i";
-       revision = "3";
-       editedCabalFile = "10ifc1r10lmzvrxa79389bz5ydcmacyz8ga4x63fw7r1rbfml0jz";
+       revision = "4";
+       editedCabalFile = "1p8ld4cxwsirlwz5ihrz6fyxbary4llxsnby42vjnhl19gylhdmk";
        libraryHaskellDepends = [ base bytestring machines mtl servant ];
        testHaskellDepends = [
          base base-compat bytestring http-client http-media machines servant
@@ -216704,6 +217162,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-mock_0_8_6" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring
+     , bytestring-conversion, hspec, hspec-discover, hspec-wai
+     , http-types, QuickCheck, servant, servant-server, transformers
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-mock";
+       version = "0.8.6";
+       sha256 = "1cr5davd7ldcm2a4f33mi74rk6qlgdqg7vzzfpf8kgxrc97syrrd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring http-types QuickCheck servant
+         servant-server transformers wai
+       ];
+       executableHaskellDepends = [
+         aeson base QuickCheck servant-server warp
+       ];
+       testHaskellDepends = [
+         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
+         servant-server wai
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Derive a mock server for free from your servant API types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-multipart" = callPackage
     ({ mkDerivation, base, bytestring, directory, http-client
      , http-media, lens, network, resourcet, servant, servant-docs
@@ -216729,6 +217216,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-multipart_0_11_5" = callPackage
+    ({ mkDerivation, array, base, bytestring, directory, http-client
+     , http-media, lens, network, random, resourcet, servant
+     , servant-client, servant-client-core, servant-docs
+     , servant-foreign, servant-server, text, transformers, wai
+     , wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-multipart";
+       version = "0.11.5";
+       sha256 = "19bz03y1fv0px30zw5q8394573d482lgchclihbnyg26w7xhmzha";
+       libraryHaskellDepends = [
+         array base bytestring directory http-media lens random resourcet
+         servant servant-client-core servant-docs servant-foreign
+         servant-server text transformers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring http-client network servant servant-client
+         servant-client-core servant-server text transformers wai warp
+       ];
+       description = "multipart/form-data (e.g file upload) support for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-named" = callPackage
     ({ mkDerivation, base, hspec, hspec-wai, http-types, servant
      , servant-server
@@ -216845,6 +217357,8 @@ self: {
        pname = "servant-pipes";
        version = "0.15.1";
        sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby";
+       revision = "1";
+       editedCabalFile = "0xm07qxw0szffm8krbvj2kdflwlx2ixlhp5scaj3fhwivycyayvg";
        libraryHaskellDepends = [
          base bytestring monad-control mtl pipes pipes-safe servant
        ];
@@ -216993,10 +217507,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.7.4";
-       sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf";
-       revision = "1";
-       editedCabalFile = "1k2qcfg8vh8nj3j621hsi09q3lj6p9ahz7rgz89psm79j9ks10d9";
+       version = "0.0.8.0";
+       sha256 = "0zzbl8qp6pi5a59zbnaq3bfzxldfcb5xykkzp5czzgaj09ypxpgw";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -217196,6 +217708,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-server_0_17" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, containers, directory, exceptions, filepath, hspec
+     , hspec-discover, hspec-wai, http-api-data, http-media, http-types
+     , monad-control, mtl, network, network-uri, QuickCheck, resourcet
+     , safe, servant, should-not-typecheck, string-conversions, tagged
+     , temporary, text, transformers, transformers-base
+     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.17";
+       sha256 = "11y7cb8r8bzkx3fb2cd5cbazxy87n0f4wm14qdxsz2g81k262k5l";
+       revision = "1";
+       editedCabalFile = "1kbdga7bi7slgcskqc3sb1xwmwif52dj8gvkxcskaw0b9xbdynhs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers exceptions
+         filepath http-api-data http-media http-types monad-control mtl
+         network network-uri resourcet servant string-conversions tagged
+         text transformers transformers-base wai wai-app-static word8
+       ];
+       executableHaskellDepends = [
+         aeson base base-compat servant text wai warp
+       ];
+       testHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring directory hspec
+         hspec-wai http-types mtl QuickCheck resourcet safe servant
+         should-not-typecheck string-conversions temporary text transformers
+         transformers-compat wai wai-extra
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A family of combinators for defining webservices APIs and serving them";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-server-namedargs" = callPackage
     ({ mkDerivation, base, bytestring, http-api-data, http-types, named
      , servant, servant-namedargs, servant-server, string-conversions
@@ -217476,6 +218026,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger_1_1_8" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
+     , hspec-discover, http-media, insert-ordered-containers, lens
+     , lens-aeson, QuickCheck, servant, singleton-bool, swagger2
+     , template-haskell, text, time, unordered-containers, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.1.8";
+       sha256 = "16zmrakgiwf9rb9bvw3mjbmkqixyms42ymh7g1vyvz399plfn0c7";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat bytestring hspec http-media
+         insert-ordered-containers lens QuickCheck servant singleton-bool
+         swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base base-compat directory doctest filepath hspec lens
+         lens-aeson QuickCheck servant swagger2 template-haskell text time
+         utf8-string vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger-tags" = callPackage
     ({ mkDerivation, base, containers, lens, servant, servant-mock
      , servant-server, servant-swagger, swagger2, text
@@ -217502,8 +218081,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.3.4.3.23.11";
        sha256 = "0ryr6h74vz6q6q0c9aixb7kwhq1vn95m3m0799cvc0xkfvm0ljha";
-       revision = "1";
-       editedCabalFile = "00pz0g7bv3vy93hwvs3427ak1sh5rdywpr0905lk53zjsv9akdi9";
+       revision = "2";
+       editedCabalFile = "1wmxiihiwjkzwqqj2996fqmixz6jblj5gh43p7dxbww3g9fdz8qi";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -217521,8 +218100,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3.3";
        sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3";
-       revision = "2";
-       editedCabalFile = "0w4jxj31sf43c1f9hsbd01xmh5cqd55fiwprq94lgwv6hrv5phrf";
+       revision = "3";
+       editedCabalFile = "0yx3q7y533v61ca4bm4wi8h7chbghj2rz92b330a544w7ac8il0p";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -217540,8 +218119,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3.3";
        sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw";
-       revision = "2";
-       editedCabalFile = "1lrsy2lhjkslj7r94rp9n3kishny2x7hnqxy6v5xi7lps9fhrmyy";
+       revision = "3";
+       editedCabalFile = "08fwi8zq3clski4bac2p2ahqf4475xwzba31jw4f4lcr01rickqk";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -217558,8 +218137,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.3.1.22.3";
        sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv";
-       revision = "1";
-       editedCabalFile = "1niwfp4igb5xmpqixmq68w7vhc6bbr32kph2983cn4nyhsnrcd9v";
+       revision = "2";
+       editedCabalFile = "195vfc3871l1clk85kzxjvz1zr986lbvgy26fazfkfsn032s74c6";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -217574,8 +218153,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-to-elm";
-       version = "0.3.0.0";
-       sha256 = "1s241rjgr8hwkrnvalx23nbyg3gdi3v5nsdfz2lys4b24wyafg5p";
+       version = "0.4.0.0";
+       sha256 = "04i4mcj41c6wzxj9kgy7x8w9f3aaa77rr91c40qbhf1lkf7jmsny";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -217693,8 +218272,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.1";
        sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01";
-       revision = "3";
-       editedCabalFile = "1qq4sg2kmdh45f4cjf36ldkdmhzryd5npy5yp558snbks0358wgs";
+       revision = "4";
+       editedCabalFile = "0k9jg3vf0p1332243mji4lzm3lk3frsmxxlz6lgg68rwh3baz6f0";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -221940,6 +222519,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sitemap-gen" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, raw-strings-qq, tasty
+     , tasty-hunit, text, time, xmlgen
+     }:
+     mkDerivation {
+       pname = "sitemap-gen";
+       version = "0.1.0.0";
+       sha256 = "0dq87yix1ii6mna8qzbgrqn07ph41283bjzy40rpwm7aqdpv2z0z";
+       libraryHaskellDepends = [ base text time xmlgen ];
+       testHaskellDepends = [
+         base bytestring HUnit raw-strings-qq tasty tasty-hunit time
+       ];
+       description = "Generate XML Sitemaps & Sitemap Indexes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sitepipe" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , exceptions, filepath, Glob, lens, lens-aeson, megaparsec
@@ -222377,14 +222972,14 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_3" = callPackage
+  "skylighting_0_8_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , skylighting-core
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.3";
-       sha256 = "1gsmbzgfxwsfvnk3mbd29llv5wkvn5v7ybs46y6kvf51sdf4v6i6";
+       version = "0.8.3.2";
+       sha256 = "03kbvz66r4fp1zq09c6arnhi2s81iwsmv8lv2kz0g7a8dr0hpaq2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -222427,7 +223022,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_3" = callPackage
+  "skylighting-core_0_8_3_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -222437,8 +223032,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.3";
-       sha256 = "07l8n290wm533qp7h1kdn99b47f2lrq4mag2snfpllll8ss35773";
+       version = "0.8.3.2";
+       sha256 = "04l1qcfqkvi7c4hv5nra4nl2zk5r6l6jkj95wvq466anls8x35rj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -222941,24 +223536,23 @@ self: {
 
   "small-bytearray-builder" = callPackage
     ({ mkDerivation, base, byteslice, bytestring, gauge
-     , natural-arithmetic, primitive, primitive-offset, QuickCheck
-     , quickcheck-classes, run-st, tasty, tasty-hunit, tasty-quickcheck
-     , text, text-short, vector, wide-word
+     , natural-arithmetic, primitive, primitive-offset
+     , primitive-unlifted, QuickCheck, quickcheck-classes, run-st, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-short, vector
+     , wide-word
      }:
      mkDerivation {
        pname = "small-bytearray-builder";
-       version = "0.3.1.0";
-       sha256 = "1swv0cwsxrmffkvx16qxxxkxfhqfwxwfz7d2msp5fzzz6all6vli";
-       revision = "1";
-       editedCabalFile = "16kslqf3zwqvjk3hhf1s3hb1xkhz0nk2a9n59fwbwqxqrbxy4kdb";
+       version = "0.3.2.0";
+       sha256 = "1nskigvkimz4bddjyz8m3y1ir29lz5iq8d698w6khaxvrvprhwxb";
        libraryHaskellDepends = [
          base byteslice bytestring natural-arithmetic primitive
-         primitive-offset run-st text-short wide-word
+         primitive-offset primitive-unlifted run-st text-short wide-word
        ];
        testHaskellDepends = [
-         base byteslice bytestring natural-arithmetic primitive QuickCheck
-         quickcheck-classes tasty tasty-hunit tasty-quickcheck text vector
-         wide-word
+         base byteslice bytestring natural-arithmetic primitive
+         primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck text vector wide-word
        ];
        benchmarkHaskellDepends = [
          base byteslice gauge natural-arithmetic primitive text-short
@@ -223287,8 +223881,8 @@ self: {
     ({ mkDerivation, base, bytesmith, primitive }:
      mkDerivation {
        pname = "smith";
-       version = "0.1.0.0";
-       sha256 = "13h0v7fl8xi84n0nq9mjsb5hphv2b7l8yaz1hg9ky3bkmqki6vml";
+       version = "0.1.1.0";
+       sha256 = "0ylhzs0lc7fxp54s74slffkr8rnasy4pak4snyi5jnvma0wiz55g";
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
@@ -225093,6 +225687,8 @@ self: {
        pname = "snmp";
        version = "0.3.1.0";
        sha256 = "0lkvhghrcmjfy2dhwybx04j5rip0d1dpyv62f8n3viad8x2djhkr";
+       revision = "2";
+       editedCabalFile = "0r8j4238gjpb6dbcmd13ycnhg3cxds9wm4fw6hrng5r42zpq41c1";
        libraryHaskellDepends = [
          base bytestring containers cryptonite ip language-asn memory
          network stm vector
@@ -229445,33 +230041,6 @@ self: {
      }) {};
 
   "statistics" = callPackage
-    ({ mkDerivation, aeson, async, base, base-orphans, binary
-     , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
-     , ieee754, math-functions, monad-par, mwc-random, primitive
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector, vector-algorithms
-     , vector-binary-instances, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "statistics";
-       version = "0.15.1.1";
-       sha256 = "015rn74f1glii26j4b2fh1fc63xvxzrh2xckiancz48kc8jdzabj";
-       libraryHaskellDepends = [
-         aeson async base base-orphans binary data-default-class deepseq
-         dense-linear-algebra math-functions monad-par mwc-random primitive
-         vector vector-algorithms vector-binary-instances vector-th-unbox
-       ];
-       testHaskellDepends = [
-         aeson base binary dense-linear-algebra erf HUnit ieee754
-         math-functions mwc-random primitive QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-         vector-algorithms
-       ];
-       description = "A library of statistical types, data, and functions";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "statistics_0_15_2_0" = callPackage
     ({ mkDerivation, aeson, async, base, base-orphans, binary
      , data-default-class, deepseq, dense-linear-algebra, erf, ieee754
      , math-functions, monad-par, mwc-random, primitive, QuickCheck
@@ -229495,7 +230064,6 @@ self: {
        ];
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -230834,15 +231402,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_47_0" = callPackage
+  "stratosphere_0_48_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.47.0";
-       sha256 = "04917xnc2hs613xi8d2mj3z2miyrrdmbywcmasg7ffcs2vxig48q";
+       version = "0.48.0";
+       sha256 = "1g6z2yfafa9h1nr3kzg4mblgl7n8dmyja8zyq888m99lh4h8qdf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -231236,28 +231804,6 @@ self: {
      }) {};
 
   "streaming-commons" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, deepseq, directory
-     , gauge, hspec, network, process, QuickCheck, random, stm, text
-     , transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
-       version = "0.2.1.1";
-       sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52";
-       libraryHaskellDepends = [
-         array async base bytestring directory network process random stm
-         text transformers unix zlib
-       ];
-       testHaskellDepends = [
-         array async base bytestring deepseq hspec network QuickCheck text
-         unix zlib
-       ];
-       benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_2_1_2" = callPackage
     ({ mkDerivation, array, async, base, bytestring, deepseq, directory
      , gauge, hspec, network, process, QuickCheck, random, stm, text
      , transformers, unix, zlib
@@ -231277,7 +231823,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -232686,6 +233231,8 @@ self: {
        pname = "structured-cli";
        version = "2.6.0.0";
        sha256 = "1g0yq5kxidmh4x0izvspafhhir64krw986s0a5rkbvkjk7ahvm7y";
+       revision = "1";
+       editedCabalFile = "0gmviyrihzpm27s91ygs5fzdawk33aqw74dyasn354kfczq5vza7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234792,30 +235339,31 @@ self: {
 
   "symbiote" = callPackage
     ({ mkDerivation, abides, aeson, async, base, bytestring, cereal
-     , containers, exceptions, extractable-singleton, http-types
-     , monad-control-aligned, mtl, QuickCheck, quickcheck-instances, stm
-     , tasty, tasty-hunit, tasty-quickcheck, text, wai, wai-extra
-     , wai-transformers, wai-websockets, warp, websockets
-     , websockets-simple, websockets-simple-extra, zeromq4-haskell
-     , zeromq4-simple
+     , chan, containers, exceptions, extractable-singleton, hashable
+     , http-types, monad-control-aligned, mtl, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck
+     , text, threaded, uuid, wai, wai-extra, wai-transformers
+     , wai-websockets, warp, websockets, websockets-simple
+     , websockets-simple-extra, zeromq4-haskell, zeromq4-simple
      }:
      mkDerivation {
        pname = "symbiote";
-       version = "0.0.2";
-       sha256 = "09siz5xy6gvlqy1vd61j7rhhqi6dyg5fc4yl6h1nifchk6126939";
+       version = "0.0.3";
+       sha256 = "0ghxakwnwjhmpgicxs8rgkrxlclgdlskhl8aqblbsabk0nj9gyaj";
        libraryHaskellDepends = [
-         abides aeson async base bytestring cereal containers exceptions
-         extractable-singleton monad-control-aligned mtl QuickCheck
-         quickcheck-instances stm text wai-transformers websockets-simple
-         websockets-simple-extra zeromq4-haskell zeromq4-simple
+         abides aeson async base bytestring cereal chan containers
+         exceptions extractable-singleton hashable monad-control-aligned mtl
+         QuickCheck quickcheck-instances stm text threaded uuid
+         wai-transformers websockets-simple websockets-simple-extra
+         zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
-         abides aeson async base bytestring cereal containers exceptions
-         extractable-singleton http-types monad-control-aligned mtl
-         QuickCheck quickcheck-instances stm tasty tasty-hunit
-         tasty-quickcheck text wai wai-extra wai-transformers wai-websockets
-         warp websockets websockets-simple websockets-simple-extra
-         zeromq4-haskell zeromq4-simple
+         abides aeson async base bytestring cereal chan containers
+         exceptions extractable-singleton hashable http-types
+         monad-control-aligned mtl QuickCheck quickcheck-instances stm tasty
+         tasty-hunit tasty-quickcheck text threaded uuid wai wai-extra
+         wai-transformers wai-websockets warp websockets websockets-simple
+         websockets-simple-extra zeromq4-haskell zeromq4-simple
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -235602,14 +236150,13 @@ self: {
      }) {};
 
   "system-info" = callPackage
-    ({ mkDerivation, attoparsec, base, process, text }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "system-info";
-       version = "0.4.0.1";
-       sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43";
-       libraryHaskellDepends = [ attoparsec base process text ];
-       testHaskellDepends = [ base ];
-       description = "Get information about CPUs, memory, etc";
+       version = "0.5.1";
+       sha256 = "10a43hb20gb8vgggibsnd3xg3al1wm4phjpp1mf2hnkf4nwxilm4";
+       libraryHaskellDepends = [ base ];
+       description = "Get the name of the operating system";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -236931,6 +237478,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar-bytestring" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, criterion, deepseq, hpath, hpath-filepath, hpath-io
+     , QuickCheck, tasty, tasty-quickcheck, time, unix, word8
+     }:
+     mkDerivation {
+       pname = "tar-bytestring";
+       version = "0.6.1.0";
+       sha256 = "1h7zq7ad5pnvfbf62s7p1irrxgs6jaf4pv4xivjq1diyj3i4nkzp";
+       revision = "1";
+       editedCabalFile = "1pykrgxcazbmab2749ckcwmvwy88ycs4vbrag218i9sb3193q1d8";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq hpath hpath-filepath
+         hpath-io time unix word8
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq hpath
+         hpath-filepath hpath-io QuickCheck tasty tasty-quickcheck time unix
+         word8
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq hpath
+         hpath-filepath hpath-io time unix word8
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tar-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, criterion, deepseq, directory
@@ -237145,16 +237722,16 @@ self: {
 
   "taskwarrior" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover
-     , process, QuickCheck, quickcheck-instances, random
-     , string-interpolate, text, time, unordered-containers, uuid
+     , process, QuickCheck, quickcheck-instances, random, text, time
+     , unordered-containers, uuid
      }:
      mkDerivation {
        pname = "taskwarrior";
-       version = "0.1.2.0";
-       sha256 = "1kmmlb3d9bfc47lvlv8v3zxp3cymv3v5i2m86m4iglhg0x6lyawp";
+       version = "0.1.2.1";
+       sha256 = "0kz4p2bq8xnv3iygdm0lbihkkvfvizb5i0c2ynw481r7rl7dq7md";
        libraryHaskellDepends = [
-         aeson base bytestring process random string-interpolate text time
-         unordered-containers uuid
+         aeson base bytestring process random text time unordered-containers
+         uuid
        ];
        testHaskellDepends = [
          aeson base hspec QuickCheck quickcheck-instances text time
@@ -237328,24 +237905,6 @@ self: {
      }) {};
 
   "tasty-hedgehog" = callPackage
-    ({ mkDerivation, base, hedgehog, tagged, tasty
-     , tasty-expected-failure
-     }:
-     mkDerivation {
-       pname = "tasty-hedgehog";
-       version = "1.0.0.1";
-       sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz";
-       revision = "2";
-       editedCabalFile = "0zrp7njdx69pvhf1lg4fv3p962qfsm2z3qk09h0jhxmfj5ishnhs";
-       libraryHaskellDepends = [ base hedgehog tagged tasty ];
-       testHaskellDepends = [
-         base hedgehog tasty tasty-expected-failure
-       ];
-       description = "Integration for tasty and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-hedgehog_1_0_0_2" = callPackage
     ({ mkDerivation, base, hedgehog, tagged, tasty
      , tasty-expected-failure
      }:
@@ -237359,7 +237918,6 @@ self: {
        ];
        description = "Integration for tasty and hedgehog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-hedgehog-coverage" = callPackage
@@ -237718,6 +238276,8 @@ self: {
        pname = "tasty-test-vector";
        version = "0";
        sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j";
+       revision = "1";
+       editedCabalFile = "13z7fj49hsxs79brh0jrncx5qcqicgzcif9gnbx8y3hbh6qw4bv0";
        libraryHaskellDepends = [ base tasty ];
        description = "Test vector support for tasty";
        license = stdenv.lib.licenses.bsd3;
@@ -239620,8 +240180,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-lib";
-       version = "0.2";
-       sha256 = "0i9q483sd5a8f7d95fxjqzyb4vsi3w1bycs518wi0k0w1rlfm33i";
+       version = "0.2.1";
+       sha256 = "1ahydivab6n4lm9fic6idvciihvy9siw89hdj2dgjjqmg9nmpv2r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -243737,6 +244297,33 @@ self: {
        broken = true;
      }) {};
 
+  "tintin_1_10_1" = callPackage
+    ({ mkDerivation, base, clay, containers, data-has, directory
+     , frontmatter, inflections, inliterate, lucid, optparse-generic
+     , process, require, temporary, text, universum, yaml
+     }:
+     mkDerivation {
+       pname = "tintin";
+       version = "1.10.1";
+       sha256 = "191dr17z3qxkk5ic605ni2kq5v7sncn0gw5xhk7nlxd5fx6nf5r2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base clay containers data-has directory frontmatter inflections
+         inliterate lucid process require temporary text universum yaml
+       ];
+       libraryToolDepends = [ require ];
+       executableHaskellDepends = [
+         base optparse-generic require universum
+       ];
+       executableToolDepends = [ require ];
+       testHaskellDepends = [ base require ];
+       description = "A softer alternative to Haddock";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tiny-scheduler" = callPackage
     ({ mkDerivation, async, base, time }:
      mkDerivation {
@@ -243904,15 +244491,62 @@ self: {
      }) {};
 
   "titan" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, cairo, glib, gtk, IfElse
+     , keera-hails-mvc-controller, keera-hails-mvc-environment-gtk
+     , keera-hails-mvc-model-protectedmodel
+     , keera-hails-mvc-solutions-gtk, keera-hails-mvc-view
+     , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk
+     , keera-hails-reactive-polling, keera-hails-reactivevalues, mtl
+     , network, network-bsd, template-haskell
+     }:
      mkDerivation {
        pname = "titan";
-       version = "0.1.0.0";
-       sha256 = "1bq8j1ch9fqpfgbchmi284afm1bbhjc47pw4lbnadxfwfcldm1gs";
+       version = "1.0.2";
+       sha256 = "15jxx0irblnw1pkwzih383w5f0xfh1nav5pal488207gfy6p9d66";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base ];
-       description = "Testing Infrastructure for Temporal AbstractioNs";
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base cairo glib gtk IfElse keera-hails-mvc-controller
+         keera-hails-mvc-environment-gtk
+         keera-hails-mvc-model-protectedmodel keera-hails-mvc-solutions-gtk
+         keera-hails-mvc-view keera-hails-mvc-view-gtk
+         keera-hails-reactive-gtk keera-hails-reactive-polling
+         keera-hails-reactivevalues mtl network network-bsd template-haskell
+       ];
+       description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "titan-debug-yampa" = callPackage
+    ({ mkDerivation, base, IfElse, network, network-bsd, stm
+     , transformers, Yampa
+     }:
+     mkDerivation {
+       pname = "titan-debug-yampa";
+       version = "1.0.1";
+       sha256 = "1dwz949njsqcwixhk7128lwasvmni8hsqjkx38l6zwbpwgwgv5ci";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base IfElse network network-bsd stm transformers Yampa
+       ];
+       description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "titan-record-yampa" = callPackage
+    ({ mkDerivation, base, Yampa }:
+     mkDerivation {
+       pname = "titan-record-yampa";
+       version = "1.0.1";
+       sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3";
+       libraryHaskellDepends = [ base Yampa ];
+       description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -244017,15 +244651,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tldr_0_6_0" = callPackage
+  "tldr_0_6_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers
      , directory, filepath, optparse-applicative, semigroups, tasty
      , tasty-golden, text, typed-process
      }:
      mkDerivation {
        pname = "tldr";
-       version = "0.6.0";
-       sha256 = "0a8d7pv5rn6p2acvyrh7kld0mq0zfrybqfwnffb7pmpl0ghzdsxa";
+       version = "0.6.1";
+       sha256 = "0nzmflhhrrnryl2jcd7bbwa52rwkp22cxqgwwqbgkyrbxslrwllh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -244160,21 +244794,6 @@ self: {
      }) {};
 
   "tls-session-manager" = callPackage
-    ({ mkDerivation, auto-update, base, basement, bytestring, clock
-     , memory, psqueues, tls
-     }:
-     mkDerivation {
-       pname = "tls-session-manager";
-       version = "0.0.3";
-       sha256 = "0k57flqp2b4bipafiyfipnqmdqv04ky39yr4s4s9sx577zz2j2yi";
-       libraryHaskellDepends = [
-         auto-update base basement bytestring clock memory psqueues tls
-       ];
-       description = "In-memory TLS session manager";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls-session-manager_0_0_4" = callPackage
     ({ mkDerivation, auto-update, base, basement, bytestring, clock
      , memory, psqueues, tls
      }:
@@ -244187,7 +244806,6 @@ self: {
        ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tlynx" = callPackage
@@ -244993,8 +245611,8 @@ self: {
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.2.2.0";
-       sha256 = "02xf5xadicgvhws21901qsn5a5v3hb77wjfy9x0q16zxbif74hvm";
+       version = "0.2.2.1";
+       sha256 = "17g9pr25jhki9r3jfvgbx8avpjikcglb9hg45rfkvk9y50wxrk15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -246333,6 +246951,19 @@ self: {
        broken = true;
      }) {};
 
+  "traversal-template" = callPackage
+    ({ mkDerivation, base, gauge, template-haskell, util }:
+     mkDerivation {
+       pname = "traversal-template";
+       version = "0.0.0.1";
+       sha256 = "0hal3vr9p49bx6c3zhfg7xa64hf81rmkl98vb14iibrmp940vbmp";
+       libraryHaskellDepends = [ base template-haskell util ];
+       testHaskellDepends = [ base template-haskell util ];
+       benchmarkHaskellDepends = [ base gauge template-haskell util ];
+       description = "See README for more info";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "traverse-with-class" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
      , transformers
@@ -246528,8 +247159,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.8.0.0";
-       sha256 = "14hb5ss2iwkbipyl7yvchhajs6wli2pfw85zs5qb1yzaxxx78qml";
+       version = "0.8.0.2";
+       sha256 = "1wjhcr3lha3fbjp6nv6ln5mplj9y856x7qckxkirisckdjrryffy";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
          semantic-source split template-haskell text unordered-containers
@@ -246548,8 +247179,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter-go";
-       version = "0.4.1.0";
-       sha256 = "1a41r2fdmwc7yyqnhfc3y38krklm9s9sn5mbc4lpf2595pqv0ggg";
+       version = "0.4.1.1";
+       sha256 = "16wbb715vn2ka3sgz1fwxa8bad0vzg16i1380kbqfr2xnfmc5hz8";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base semantic-source template-haskell tree-sitter
@@ -248006,6 +248637,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_16" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, fail
+     , foldl, hostname, managed, optional-args, optparse-applicative
+     , process, semigroups, stm, streaming-commons, system-fileio
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.16";
+       sha256 = "164cs5gsl6pmfj4yd9p4vj02n1sj5krgd6azd5zfgyw4q7bfc5jn";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm streaming-commons
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base doctest fail system-filepath temporary
+       ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -249247,6 +249906,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_5_1_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
+     , hspec, QuickCheck, random, text, weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.5.1.0";
+       sha256 = "14bz0gjf6rfnrisffp9lvvyzdimdhdcg5mwy5n9mrzlg4nv5pi2c";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq ghc ghc-paths random
+         text weigh
+       ];
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-of-html-static" = callPackage
     ({ mkDerivation, base, template-haskell, type-of-html }:
      mkDerivation {
@@ -250011,27 +250692,6 @@ self: {
      }) {};
 
   "tzdata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
-     , test-framework, test-framework-hunit, test-framework-th, unix
-     , vector
-     }:
-     mkDerivation {
-       pname = "tzdata";
-       version = "0.1.20190325.0";
-       sha256 = "0vxisw10a414kh2rn0maj6zvcs8vi5kacfwxs0smjspvm513bkb2";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq vector
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tzdata_0_1_20190911_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -250050,7 +250710,6 @@ self: {
        ];
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -250587,18 +251246,26 @@ self: {
      }) {};
 
   "unbeliever" = callPackage
-    ({ mkDerivation, base, bytestring, core-data, core-program
-     , core-text, fingertree, gauge, hspec, safe-exceptions, text
-     , text-short
+    ({ mkDerivation, async, base, bytestring, chronologique, containers
+     , core-data, core-program, core-text, deepseq, directory
+     , exceptions, filepath, fingertree, fsnotify, gauge, hashable
+     , hourglass, hspec, megaparsec, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm
+     , template-haskell, terminal-size, text, text-short, transformers
+     , unix, unordered-containers
      }:
      mkDerivation {
        pname = "unbeliever";
-       version = "0.10.0.1";
-       sha256 = "0fmv76xmi4ansrksa07vidqvxiqgdmvvampkqngi1ma7g3k2n29x";
+       version = "0.10.0.5";
+       sha256 = "1h0zy19vfhg1x671yhfsr1rbpr7c9jhbr0lxhj7cb25jm94hjajw";
        libraryHaskellDepends = [ base core-data core-program core-text ];
        testHaskellDepends = [
-         base bytestring core-data core-program core-text fingertree hspec
-         safe-exceptions text text-short
+         async base bytestring chronologique containers core-data
+         core-program core-text deepseq directory exceptions filepath
+         fingertree fsnotify hashable hourglass hspec megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal safe-exceptions
+         scientific stm template-haskell terminal-size text text-short
+         transformers unix unordered-containers
        ];
        benchmarkHaskellDepends = [
          base bytestring core-data core-program core-text gauge text
@@ -255505,30 +256172,26 @@ self: {
 
   "vectortiles" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , hashable, hex, microlens, microlens-platform, mtl
-     , protocol-buffers, protocol-buffers-descriptor, tasty, tasty-hunit
-     , text, transformers, unordered-containers, vector
+     , hashable, microlens, microlens-platform, mtl, protocol-buffers
+     , protocol-buffers-descriptor, tasty, tasty-hunit, text
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "vectortiles";
-       version = "1.4.0";
-       sha256 = "1h0mx5sl379486panyxpanld8qrlhak9knhz7jzqqv7is3rw8g1r";
-       revision = "1";
-       editedCabalFile = "1nlkhmfcvlzi96nzq8cpbqw5akrjahnrhl460q07vq6iyhibvf87";
+       version = "1.5.0";
+       sha256 = "1vy990m7vlsw0ffi0ys7xpz97npw0b3vldw6ykhcsyxhvhg6jrif";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable mtl protocol-buffers
          protocol-buffers-descriptor text transformers unordered-containers
          vector
        ];
        testHaskellDepends = [
-         base bytestring containers hashable hex mtl protocol-buffers
-         protocol-buffers-descriptor tasty tasty-hunit text
-         unordered-containers vector
+         base bytestring containers protocol-buffers tasty tasty-hunit text
+         vector
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers criterion hashable microlens
-         microlens-platform mtl protocol-buffers protocol-buffers-descriptor
-         text unordered-containers vector
+         base bytestring criterion microlens microlens-platform
+         unordered-containers vector
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
@@ -255787,8 +256450,8 @@ self: {
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.5.1.1";
-       sha256 = "1cs004ixw6rp2zg9hyw4yf0n15rq3s1ns9yy18rr8sxmcsw6jb9g";
+       version = "3.5.2";
+       sha256 = "0a2ymd7wmpakcrm1fz9xwmjqlka7jmd8kb6385frd36nbi9bx78h";
        libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
        testHaskellDepends = [
          base base-prelude checkers megaparsec microlens QuickCheck tasty
@@ -255821,17 +256484,51 @@ self: {
      }) {};
 
   "vformat" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+    ({ mkDerivation, base, containers, exceptions, hspec, QuickCheck }:
      mkDerivation {
        pname = "vformat";
-       version = "0.9.1.0";
-       sha256 = "1bq7m1yjqkgqk1bxh28n67n04yfxvp2466xmrb83a93w22h98k7l";
-       libraryHaskellDepends = [ base containers time ];
-       testHaskellDepends = [ base containers hspec QuickCheck time ];
+       version = "0.13.0.0";
+       sha256 = "0ribzajgsjmpbr4r248hiy5krx692ik623gpz6iz1qqrv4w54lnv";
+       libraryHaskellDepends = [ base containers exceptions ];
+       testHaskellDepends = [
+         base containers exceptions hspec QuickCheck
+       ];
        description = "A Python str.format() like formatter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vformat-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, scientific, text
+     , unordered-containers, vector, vformat
+     }:
+     mkDerivation {
+       pname = "vformat-aeson";
+       version = "0.1.0.1";
+       sha256 = "1cj3zp5n1j86jds906r9yrhanl8xq08gk97x6i64d651pry4h11v";
+       libraryHaskellDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+         vformat
+       ];
+       testHaskellDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+         vformat
+       ];
+       description = "Extend vformat to Aeson datatypes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "vformat-time" = callPackage
+    ({ mkDerivation, base, time, vformat }:
+     mkDerivation {
+       pname = "vformat-time";
+       version = "0.1.0.0";
+       sha256 = "0s3b9ryyzmvy1fpxdnxdgrpi5faz67r8immm30pv6njy741k1l36";
+       libraryHaskellDepends = [ base time vformat ];
+       testHaskellDepends = [ base time vformat ];
+       description = "Extend vformat to time datatypes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vfr-waypoints" = callPackage
     ({ mkDerivation, base, containers, dimensional, fuzzy
      , geodetic-types, lens, monoid-subclasses, optparse-applicative
@@ -257035,41 +257732,6 @@ self: {
      }) {};
 
   "wai-app-static" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, cryptonite, directory, file-embed, filepath, hspec
-     , http-date, http-types, memory, mime-types, mockery, network
-     , old-locale, optparse-applicative, template-haskell, temporary
-     , text, time, transformers, unix-compat, unordered-containers, wai
-     , wai-extra, warp, zlib
-     }:
-     mkDerivation {
-       pname = "wai-app-static";
-       version = "3.1.6.3";
-       sha256 = "0s6bpz5gmjy797bnnw1y5mwy9761h46bjp1srnrh7cxlnvm93c4c";
-       revision = "3";
-       editedCabalFile = "01qzkb1niv0jzbsh802gw1a9w85h0nhp1vd6hln958hsxf25n0d9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers cryptonite
-         directory file-embed filepath http-date http-types memory
-         mime-types old-locale optparse-applicative template-haskell text
-         time transformers unix-compat unordered-containers wai wai-extra
-         warp zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring containers directory mime-types text
-       ];
-       testHaskellDepends = [
-         base bytestring filepath hspec http-date http-types mime-types
-         mockery network old-locale temporary text time transformers
-         unix-compat wai wai-extra zlib
-       ];
-       description = "WAI application for static serving";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-app-static_3_1_7_1" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, cryptonite, directory, file-embed, filepath, hspec
      , http-date, http-types, memory, mime-types, mockery, network
@@ -257081,6 +257743,8 @@ self: {
        pname = "wai-app-static";
        version = "3.1.7.1";
        sha256 = "10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8";
+       revision = "1";
+       editedCabalFile = "0bkmml30rzifvb7nxddj3pxczk0kniahra19mjn0qrkzy1n5752p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -257100,7 +257764,6 @@ self: {
        ];
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-cli" = callPackage
@@ -257255,37 +257918,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.28";
-       sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7";
-       revision = "1";
-       editedCabalFile = "0kb3fpiyq6kp7vm16cf8j4225q74ssfq9ilfdms7prn1c6brb19g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 iproute network old-locale
-         resourcet streaming-commons text time transformers unix unix-compat
-         vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_29" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -257312,7 +257944,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -257409,10 +258040,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-handler-launch";
-       version = "3.0.2.4";
-       sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f";
-       revision = "1";
-       editedCabalFile = "1mjxbzw3a5wybcp8s4x05rx91p2qaabpfci6w2k6p6nw4rjvfijv";
+       version = "3.0.3.1";
+       sha256 = "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m";
        libraryHaskellDepends = [
          async base bytestring http-types process streaming-commons
          transformers wai warp
@@ -257421,23 +258050,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "wai-handler-launch_3_0_3" = callPackage
-    ({ mkDerivation, async, base, bytestring, http-types, process
-     , streaming-commons, transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "wai-handler-launch";
-       version = "3.0.3";
-       sha256 = "1416vx2gnllyrz8vrzq1x6in9ypa1wgxwqyh5zqbb9rfwbb83ha5";
-       libraryHaskellDepends = [
-         async base bytestring http-types process streaming-commons
-         transformers wai warp
-       ];
-       description = "Launch a web app in the default browser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -259008,7 +259620,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_3_7" = callPackage
+  "warp_3_3_8" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -259018,8 +259630,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.7";
-       sha256 = "1145nbrd6gzr0qhd7vgf5vdhs22xd9z1h9cr2jbs77r6kqypzy3v";
+       version = "3.3.8";
+       sha256 = "13amshbyz185inkx1xd0ywa1096dlwp3s24hkrls166wiiq6gzc4";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -259066,8 +259678,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-grpc";
-       version = "0.2.0.0";
-       sha256 = "180h609sc1ck3xxs4r2hk6bij0g22lxlllpmhqkkf1drvbgygssi";
+       version = "0.3.0.0";
+       sha256 = "15zpb9liai56i9765sf05kww7zykd68kd38vc0s0rhx9jgqk2clj";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive http-types http2
          http2-grpc-types wai warp warp-tls
@@ -259129,14 +259741,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp-tls_3_2_10" = callPackage
+  "warp-tls_3_2_11" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.2.10";
-       sha256 = "1afssdbcyq3gwac13g0v9d9zr3sg40cq76g4yh2xsk9kzykllvr2";
+       version = "3.2.11";
+       sha256 = "05y0i0b84kssvgr2hb3rdlqk55wl2lfcbp9sbia8lqnbc6cp0606";
        libraryHaskellDepends = [
          base bytestring cryptonite data-default-class network
          streaming-commons tls tls-session-manager wai warp
@@ -260962,6 +261574,25 @@ self: {
        broken = true;
      }) {};
 
+  "wide-word_0_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog
+     , primitive, QuickCheck, quickcheck-classes, semirings
+     }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.1.0";
+       sha256 = "101a2irkgsz9264zj9vdwbkycf25phsf1kbhh6nrx8mh9207aaiw";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [
+         base bytestring ghc-prim hedgehog primitive QuickCheck
+         quickcheck-classes semirings
+       ];
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
      , random, vector
@@ -266950,31 +267581,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.7.1.1";
-       sha256 = "0a1mz7nfrrgw0dalfbj72kd76nbgr9in63zrpijl4nd1p1j99br5";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent text yesod-auth yesod-core
-         yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_7_1_2" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
@@ -266997,7 +267603,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage

From 8e5d5bac2ec91fa4c019bb8d686373c90a1b1830 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Sun, 19 Jan 2020 15:19:57 +0000
Subject: [PATCH 614/755] glirc: 2.33.1 -> 2.34

Really this is a fix of the build because of the automatic version bump
---
 .../haskell-modules/configuration-common.nix           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5605af97ddcf..8d7d2fbfd8fe 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1337,7 +1337,15 @@ self: super: {
 
   # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more
   # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
-  glirc = doJailbreak super.glirc;
+  # 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base
+
+  glirc = doJailbreak (super.glirc.override {
+    regex-tdfa = self.regex-tdfa_1_3_1_0;
+  });
+
+  regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override {
+    regex-base = self.regex-base_0_94_0_0;
+  });
 
   # apply patches from https://github.com/snapframework/snap-server/pull/126
   # manually until they are accepted upstream

From bb3a93fdb5c8def0b7f91803595a0f13a354ca05 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Sun, 19 Jan 2020 14:20:30 +0000
Subject: [PATCH 615/755] matterhorn: init at 50200.6.0

Command line mattermost client
---
 .../haskell-modules/configuration-common.nix         | 12 ++++++++++++
 .../haskell-modules/configuration-hackage2nix.yaml   |  4 ++--
 pkgs/top-level/all-packages.nix                      |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8d7d2fbfd8fe..7596215f96dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1347,6 +1347,18 @@ self: super: {
     regex-base = self.regex-base_0_94_0_0;
   });
 
+  # 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
+  # multiple versions of them were being pulled in by the others which is not allowed.
+  # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
+  matterhorn = doJailbreak (super.matterhorn.override {
+    brick-skylighting = self.brick-skylighting.override {
+      brick = self.brick_0_50_1;
+    };
+  });
+
+  # 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi
+  Unique = doJailbreak super.Unique;
+
   # apply patches from https://github.com/snapframework/snap-server/pull/126
   # manually until they are accepted upstream
   snap-server = overrideCabal super.snap-server (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b4e17dd59c85..5eddabd89349 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2603,6 +2603,8 @@ package-maintainers:
     - streaming-wai
   kiwi:
     - glirc
+    - matterhorn
+    - Unique
   psibi:
     - path-pieces
     - persistent
@@ -7173,7 +7175,6 @@ broken-packages:
   - mathlink
   - matrix-as-xyz
   - matsuri
-  - matterhorn
   - maude
   - maxent
   - maxent-learner-hw
@@ -9929,7 +9930,6 @@ broken-packages:
   - uniform-io
   - union
   - union-map
-  - Unique
   - uniqueid
   - uniquely-represented-sets
   - units-attoparsec
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4cba331d1a..0fc3cb522433 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13303,6 +13303,8 @@ in
 
   matio = callPackage ../development/libraries/matio { };
 
+  matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn;
+
   mbedtls = callPackage ../development/libraries/mbedtls { };
 
   mdds = callPackage ../development/libraries/mdds { };

From 05a54d417b6eae61194331a238c7a07efbe2bce6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2020 19:31:12 +0100
Subject: [PATCH 616/755] ghc-8.8.x: update overrides

---
 .../haskell-modules/configuration-ghc-8.8.x.nix            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 7198ed5ff193..f49aa03e07e0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -93,7 +93,7 @@ self: super: {
   optparse-applicative = self.optparse-applicative_0_15_1_0;
   pandoc = self.pandoc_2_9_1_1;
   pandoc-types = self.pandoc-types_1_20;
-  prettyprinter = self.prettyprinter_1_5_1;
+  prettyprinter = self.prettyprinter_1_6_0;
   primitive = dontCheck super.primitive_0_7_0_0;  # evaluating the test suite gives an infinite recursion
   regex-base = self.regex-base_0_94_0_0;
   regex-compat = self.regex-compat_0_95_2_0;
@@ -102,10 +102,9 @@ self: super: {
   regex-tdfa = self.regex-tdfa_1_3_1_0;
   shelly = self.shelly_1_9_0;
   singletons = self.singletons_2_6;
-  skylighting = self.skylighting_0_8_3;
-  skylighting-core = self.skylighting-core_0_8_3;
+  skylighting = self.skylighting_0_8_3_2;
+  skylighting-core = self.skylighting-core_0_8_3_2;
   sop-core = self.sop-core_0_5_0_0;
-  tls-session-manager = self.tls-session-manager_0_0_4;
   texmath = self.texmath_0_12;
   th-desugar = self.th-desugar_1_10;
   tls = self.tls_1_5_3;

From d17666f923692f03337a044469a2ef4a924341a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2020 19:35:31 +0100
Subject: [PATCH 617/755] all-cabal-hashes: update to Hackage at
 2020-01-23T17:44: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 d6b5965cca0a..2415e94b92dc 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/b2812edaaed9f9033e48dfbcd45e7e5fb56daccd.tar.gz";
-  sha256 = "1a2073gknks4r2ibm3ji1wrib6pr3aicg6wjgzsj2r5xgad7jm6g";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/10e6ea0c54a4aa41de51d1d7e2314115bb2e172a.tar.gz";
+  sha256 = "0kjy1dxa2kra4j02ni8lpg74jy7fl361yiha330c52spvd2v8i8h";
 }

From 15aa9dd0a350227d0f2ee14e88e9244f65f3b7bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Jan 2020 20:21:46 +0100
Subject: [PATCH 618/755] haskell-prettyprinter: disable the failing test suite
 of version 1.6.0

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7596215f96dc..52b0f12d7574 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1054,10 +1054,10 @@ self: super: {
   # This will probably be able to be removed when we update to LTS-15.
   dhall_1_29_0 =
     dontCheck (super.dhall_1_29_0.override {
-      prettyprinter = self.prettyprinter_1_5_1;
+      prettyprinter = self.prettyprinter_1_6_0;
       prettyprinter-ansi-terminal =
         self.prettyprinter-ansi-terminal.override {
-          prettyprinter = self.prettyprinter_1_5_1;
+          prettyprinter = self.prettyprinter_1_6_0;
         };
     });
   dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
@@ -1388,4 +1388,7 @@ self: super: {
   # krank-0.1.0 does not accept PyF-0.9.0.0.
   krank = doJailbreak super.krank;
 
+  # prettyprinter-1.6.0 fails its doctest suite.
+  prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From ade7cc1fd396159c81e49354828fae58372225f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Jan 2020 20:37:27 +0100
Subject: [PATCH 619/755] haskell-hlint: update override for new
 ghc-lib-parser-ex dependency

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 52b0f12d7574..64a15e396899 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1237,8 +1237,8 @@ self: super: {
   # Test suite won't link for no apparent reason.
   constraints-deriving = dontCheck super.constraints-deriving;
 
-  # need newer version of ghc-libparser
-  hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
+  # Use a matching version of ghc-lib-parser.
+  ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
 
   # https://github.com/sol/hpack/issues/366
   hpack = self.hpack_0_33_0;

From 5e4c494636078516ab6197f9b65cd47aa36ab289 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 23 Jan 2020 15:42:57 +0000
Subject: [PATCH 620/755] execline: wrap unconditionally; strip

I don't think there's any situation in which an unwrapped execlineb is
useful -- if you want to use different versions of the execlineb tool
it'll still prefer ones in PATH.  At the same time, implementing the
wrapper in this way, as a series of two derivations, meant that we
didn't get stdenv goodness for the wrapper.  This meant that, for
example, the wrapper was not stripped, and so execline ended up with
runtime dependencies on gcc and the Linux headers.  I don't want to
have to reimplement this sort of stuff when it's already in stdenv,
and so it makes much more sense to create the wrapper in the
mkDerivation call, where all of stdenv's normal magic will find it.
---
 pkgs/tools/misc/execline/default.nix         | 96 ++++++--------------
 pkgs/tools/misc/execline/execlineb-wrapper.c |  7 ++
 2 files changed, 37 insertions(+), 66 deletions(-)

diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index d06798e5d6dd..fb685e65a4f5 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,85 +1,49 @@
 { lib, skawarePackages
 # for execlineb-with-builtins
 , coreutils, gnugrep, writeScriptBin, runCommand, runCommandCC
-# Whether to wrap bin/execlineb to have the execline tools on its PATH.
-, execlineb-with-builtins ? true
 }:
 
 with skawarePackages;
 
-let
+buildPackage {
+  pname = "execline";
+  version = "2.5.3.0";
+  sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805";
+
+  description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
+
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  execline =
-    buildPackage {
-      pname = "execline";
-      version = "2.5.3.0";
-      sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805";
+  # TODO: nsss support
+  configureFlags = [
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+  ];
 
-      description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
+  postInstall = ''
+    # remove all execline executables from build directory
+    rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libexecline.*
 
-      inherit outputs;
+    mv doc $doc/share/doc/execline/html
+    mv examples $doc/share/doc/execline/examples
 
-      # TODO: nsss support
-      configureFlags = [
-        "--libdir=\${lib}/lib"
-        "--dynlibdir=\${lib}/lib"
-        "--bindir=\${bin}/bin"
-        "--includedir=\${dev}/include"
-        "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
-        "--with-include=${skalibs.dev}/include"
-        "--with-lib=${skalibs.lib}/lib"
-        "--with-dynlib=${skalibs.lib}/lib"
-      ];
-
-      postInstall = ''
-        # remove all execline executables from build directory
-        rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
-        rm libexecline.*
-
-        mv doc $doc/share/doc/execline/html
-        mv examples $doc/share/doc/execline/examples
-      '';
-
-    };
-
-  # A wrapper around execlineb, which provides all execline
-  # tools on `execlineb`’s PATH.
-  # It is implemented as a C script, because on non-Linux,
-  # nested shebang lines are not supported.
-  execlineb-with-builtins-drv = runCommandCC "execlineb" {} ''
-    mkdir -p $out/bin
+    mv $bin/bin/execlineb $bin/bin/.execlineb-wrapped
     cc \
       -O \
       -Wall -Wpedantic \
-      -D 'EXECLINEB_PATH()="${execline}/bin/execlineb"' \
-      -D 'EXECLINE_BIN_PATH()="${execline}/bin"' \
+      -D "EXECLINEB_PATH()=\"$bin/bin/.execlineb-wrapped\"" \
+      -D "EXECLINE_BIN_PATH()=\"$bin/bin\"" \
       -I "${skalibs.dev}/include" \
       -L "${skalibs.lib}/lib" \
-      -l"skarnet" \
-      -o "$out/bin/execlineb" \
+      -lskarnet \
+      -o "$bin/bin/execlineb" \
       ${./execlineb-wrapper.c}
   '';
-
-
-  # the original execline package, with bin/execlineb overwritten
-  execline-with-builtins = runCommand "my-execline"
-    (execline.drvAttrs // {
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-    })
-    # copy every output and just overwrite the execlineb binary in $bin
-    ''
-      ${lib.concatMapStringsSep "\n"
-        (output: ''
-          cp -r ${execline.${output}} "''$${output}"
-          chmod --recursive +w "''$${output}"
-        '')
-        outputs}
-      install ${execlineb-with-builtins-drv}/bin/execlineb $bin/bin/execlineb
-    '';
-
-in
-  if execlineb-with-builtins
-  then execline-with-builtins
-  else execline
+}
diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/tools/misc/execline/execlineb-wrapper.c
index 09ccf990af7f..d31a76ca26eb 100644
--- a/pkgs/tools/misc/execline/execlineb-wrapper.c
+++ b/pkgs/tools/misc/execline/execlineb-wrapper.c
@@ -1,3 +1,10 @@
+/*
+ * A wrapper around execlineb, which provides all execline
+ * tools on execlineb’s PATH.
+ * It is implemented as a C program, because on non-Linux,
+ * nested shebang lines are not supported.
+ */
+
 #include <stdlib.h>
 #include <string.h>
 

From 5365e3650da6127118bf26febd23dd71ca72d9e9 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 17:47:09 +0100
Subject: [PATCH 621/755] luaPackages.digestif: scm1 -> 0.2-1

Now it's a released package so no need to specify the manifest anymore.
---
 maintainers/scripts/luarocks-packages.csv     |  2 +-
 .../lua-modules/generated-packages.nix        | 22 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 526a928438d2..49ebf3e5b422 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -11,7 +11,7 @@ compat53,,,,,vcunat
 coxpcall,,,1.17.0-1,,
 cqueues,,,,,vcunat
 cyrussasl,,,,,vcunat
-digestif,,http://luarocks.org/dev,,lua5_3,
+digestif,,,,lua5_3,
 dkjson,,,,,
 fifo,,,,,
 http,,,,,vcunat
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4cff22a8d41c..2a70baf8d3ce 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -266,28 +266,18 @@ cyrussasl = buildLuarocksPackage {
 };
 digestif = buildLuarocksPackage {
   pname = "digestif";
-  version = "scm-1";
-
-  knownRockspec = (fetchurl {
-    url    = http://luarocks.org/dev/digestif-scm-1.rockspec;
-    sha256 = "18rixbni4hmrmh3qj3vpjbsphzdvchswajphc9ysm52ccpyzh687";
-  }).outPath;
-
-  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
-  "url": "git://github.com/astoff/digestif",
-  "rev": "51c321f1b68b77f648fa6adf356de48925f69fe0",
-  "date": "2019-06-08T15:03:33+02:00",
-  "sha256": "1c9cl81vfzirc325wipdy992yn20b8xv8nqzl5mdhyz8zfp84hs7",
-  "fetchSubmodules": true
-}
- '') ["date"]) ;
+  version = "0.2-1";
 
+  src = fetchurl {
+    url    = mirror://luarocks/digestif-0.2-1.src.rock;
+    sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd";
+  };
   disabled = (luaOlder "5.3");
   propagatedBuildInputs = [ lua lpeg dkjson ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/astoff/digestif/";
-    description = "Code analyzer for TeX.";
+    description = "A code analyzer for TeX";
     license = {
       fullName = "MIT";
     };

From bc07d117f2ce6156ddc4b383d9ec94ef714d4dda Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 18:18:30 +0100
Subject: [PATCH 622/755] luaPackages.linenoise: init at 0.9-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 49ebf3e5b422..f9b74b279e8f 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -18,6 +18,7 @@ http,,,,,vcunat
 inspect,,,,,
 ldoc,,,,,
 lgi,,,,,
+linenoise,,,,,
 ljsyscall,,,,lua5_1,lblasc
 lpeg,,,,,vyp
 lpeg_patterns,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2a70baf8d3ce..d1e72b41cdd5 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -402,6 +402,31 @@ lgi = buildLuarocksPackage {
     };
   };
 };
+linenoise = buildLuarocksPackage {
+  pname = "linenoise";
+  version = "0.9-1";
+
+  knownRockspec = (fetchurl {
+    url    = mirror://luarocks/linenoise-0.9-1.rockspec;
+    sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4";
+  }).outPath;
+
+  src = fetchurl {
+    url    = https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz;
+    sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c";
+  };
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/hoelzro/lua-linenoise";
+    description = "A binding for the linenoise command line library";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 ljsyscall = buildLuarocksPackage {
   pname = "ljsyscall";
   version = "0.12-1";

From 11af4a1b4274a2a66f39acca5570f0a94837c170 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 24 Jan 2020 15:29:06 -0500
Subject: [PATCH 623/755] httplz: 1.6.0 -> 1.8.0

---
 pkgs/tools/networking/httplz/cargo-lock.patch | 411 +++++++++++-------
 pkgs/tools/networking/httplz/default.nix      |   6 +-
 2 files changed, 245 insertions(+), 172 deletions(-)

diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch
index 1d1632a0e82a..5ded54799a78 100644
--- a/pkgs/tools/networking/httplz/cargo-lock.patch
+++ b/pkgs/tools/networking/httplz/cargo-lock.patch
@@ -1,14 +1,14 @@
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..fe230f5
+index 0000000..4b798fc
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,1190 @@
+@@ -0,0 +1,1263 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
 +name = "adler32"
-+version = "1.0.3"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -16,7 +16,7 @@ index 0000000..fe230f5
 +version = "0.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -34,16 +34,22 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "atty"
-+version = "0.2.13"
++version = "0.2.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "autocfg"
-+version = "0.1.6"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "autocfg"
++version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -52,7 +58,7 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -65,7 +71,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "bitflags"
-+version = "1.1.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -73,8 +79,8 @@ index 0000000..fe230f5
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -83,7 +89,7 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -97,7 +103,7 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -105,27 +111,26 @@ index 0000000..fe230f5
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "c2-chacha"
-+version = "0.2.2"
++version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.0.45"
++version = "1.0.50"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "cfg-if"
-+version = "0.1.9"
++version = "0.1.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -134,11 +139,11 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -147,7 +152,7 @@ index 0000000..fe230f5
 +version = "0.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -156,7 +161,7 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -169,7 +174,7 @@ index 0000000..fe230f5
 +version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -187,23 +192,28 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
++name = "either"
++version = "1.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
 +name = "embed-resource"
-+version = "1.3.0"
++version = "1.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "flate2"
-+version = "1.0.11"
++version = "1.0.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -231,12 +241,20 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.1.12"
++version = "0.1.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -246,33 +264,38 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "https"
-+version = "1.6.0"
++version = "1.8.0"
 +dependencies = [
 + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
 + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 + "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -285,7 +308,7 @@ index 0000000..fe230f5
 + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -310,7 +333,7 @@ index 0000000..fe230f5
 +dependencies = [
 + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -323,13 +346,21 @@ index 0000000..fe230f5
 + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
++name = "itertools"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
 +name = "itoa"
 +version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -351,7 +382,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.62"
++version = "0.2.66"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -367,7 +398,7 @@ index 0000000..fe230f5
 +version = "0.4.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -381,12 +412,12 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "memchr"
-+version = "2.2.1"
++version = "2.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -409,20 +440,11 @@ index 0000000..fe230f5
 +]
 +
 +[[package]]
-+name = "miniz-sys"
-+version = "0.1.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
 +name = "miniz_oxide"
-+version = "0.3.2"
++version = "0.3.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -436,14 +458,14 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
 + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -452,10 +474,10 @@ index 0000000..fe230f5
 +version = "0.14.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -464,36 +486,37 @@ index 0000000..fe230f5
 +version = "0.1.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "num-traits"
-+version = "0.2.8"
++version = "0.2.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "num_cpus"
-+version = "1.10.1"
++version = "1.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "openssl"
-+version = "0.10.24"
++version = "0.10.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -503,17 +526,22 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "openssl-sys"
-+version = "0.9.49"
++version = "0.9.53"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
++name = "os-str-generic"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
 +name = "percent-encoding"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -560,7 +588,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "pkg-config"
-+version = "0.3.16"
++version = "0.3.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -573,7 +601,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "ppv-lite86"
-+version = "0.2.5"
++version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -586,8 +614,8 @@ index 0000000..fe230f5
 +version = "0.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -601,11 +629,11 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "rand"
-+version = "0.7.1"
++version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -616,7 +644,7 @@ index 0000000..fe230f5
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -625,7 +653,7 @@ index 0000000..fe230f5
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -647,7 +675,7 @@ index 0000000..fe230f5
 +version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -679,7 +707,7 @@ index 0000000..fe230f5
 +version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
@@ -691,7 +719,7 @@ index 0000000..fe230f5
 +dependencies = [
 + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -702,7 +730,7 @@ index 0000000..fe230f5
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -729,18 +757,18 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "regex"
-+version = "1.3.1"
++version = "1.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.6.12"
++version = "0.6.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -765,12 +793,20 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "safemem"
-+version = "0.3.2"
++version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
 +name = "schannel"
-+version = "0.1.15"
++version = "0.1.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -779,18 +815,18 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "security-framework"
-+version = "0.3.1"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "security-framework-sys"
-+version = "0.3.1"
++version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -837,7 +873,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "smallvec"
-+version = "0.6.10"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -865,10 +901,10 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "tabwriter"
-+version = "1.1.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -876,9 +912,9 @@ index 0000000..fe230f5
 +version = "3.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 + "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -889,12 +925,12 @@ index 0000000..fe230f5
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "thread_local"
-+version = "0.3.6"
++version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -905,7 +941,7 @@ index 0000000..fe230f5
 +version = "0.1.42"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
@@ -943,10 +979,10 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "unicase"
-+version = "2.5.1"
++version = "2.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
@@ -959,15 +995,15 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "unicode-normalization"
-+version = "0.1.8"
++version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "unicode-width"
-+version = "0.1.6"
++version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -995,7 +1031,7 @@ index 0000000..fe230f5
 +
 +[[package]]
 +name = "vcpkg"
-+version = "0.2.7"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -1009,6 +1045,11 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
++name = "version_check"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
 +name = "void"
 +version = "1.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1018,7 +1059,7 @@ index 0000000..fe230f5
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 + "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -1027,13 +1068,23 @@ index 0000000..fe230f5
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "walkdir"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "wasi"
-+version = "0.7.0"
++version = "0.9.0+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
@@ -1051,36 +1102,50 @@ index 0000000..fe230f5
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
++name = "winapi-util"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
 +name = "winapi-x86_64-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "winreg"
-+version = "0.5.1"
++version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
++[[package]]
++name = "xml-rs"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
 +[metadata]
-+"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
++"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
-+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-+"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
 +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f"
-+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
-+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
-+"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 +"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
@@ -1088,53 +1153,56 @@ index 0000000..fe230f5
 +"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 +"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f"
 +"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
-+"checksum embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1419cfb011b3f11cbe865738cc2a36cc574437de4e3f2a1a57f118b230aa4f3"
-+"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"
++"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
++"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c"
++"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 +"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 +"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
 +"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068"
 +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 +"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
++"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
 +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
-+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d"
-+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
++"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
 +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 +"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-+"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
-+"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"
++"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
 +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
 +"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 +"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
-+"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15"
++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
++"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
++"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
 +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884"
++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
++"checksum os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e"
 +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 +"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-+"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
-+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-+"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51"
++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
@@ -1149,48 +1217,53 @@ index 0000000..fe230f5
 +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
++"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
++"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
 +"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49"
-+"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
-+"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339"
-+"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2"
-+"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56"
++"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
++"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
++"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
 +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
 +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
 +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
 +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
 +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-+"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb"
++"checksum tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111"
 +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458"
 +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
 +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
 +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-+"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
++"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
++"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-+"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
++"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 +"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
 +"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
-+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
++"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
++"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index 6c84ac8da709..55630d7814c2 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httplz";
-  version = "1.6.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "thecoshman";
     repo = "http";
     rev = "v${version}";
-    sha256 = "1y9mlbympb19i3iw7s7jm7lvkpcl4w0sig6jnd4w3ykhkdhzh6di";
+    sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
-  cargoSha256 = "1bxh7p2a04lpghqms8cx1f1cq5nbcx6cxh5ac7i72d5vzy4v07nl";
+  cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq";
 
   postInstall = ''
     wrapProgram $out/bin/httplz \

From dbbbdfd3c2e4fa633efc13be48efe28829d7e5d1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 19 Jan 2020 15:27:45 +0100
Subject: [PATCH 624/755] sfizz: init at unstable-2020-01-24

---
 pkgs/applications/audio/sfizz/default.nix | 32 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/sfizz/default.nix

diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix
new file mode 100644
index 000000000000..d785d3780658
--- /dev/null
+++ b/pkgs/applications/audio/sfizz/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile }:
+
+stdenv.mkDerivation rec {
+  pname = "sfizz";
+  version = "unstable-2020-01-24";
+
+  src = fetchFromGitHub {
+    owner = "sfztools";
+    repo = pname;
+    rev = "b9c332777853cb35faeeda2ff4bf34ea7121ffb9";
+    sha256 = "0wzgwpcwal5a7ifrm1hx8y6vx832qixk9ilp8wkjnsdxj6i88p2c";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libjack2 libsndfile ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DSFIZZ_TESTS=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/sfztools/sfizz";
+    description = "SFZ jack client and LV2 plugin";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.all;
+    badPlatforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fc3cb522433..1a07b8bd8ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21304,6 +21304,8 @@ in
 
   setbfree = callPackage ../applications/audio/setbfree { };
 
+  sfizz = callPackage ../applications/audio/sfizz { };
+
   sfxr = callPackage ../applications/audio/sfxr { };
 
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };

From 40a03a8c6d743ef5a13337f9869019411e15296d Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sat, 18 Jan 2020 14:25:36 +0100
Subject: [PATCH 625/755] aria2p: init at 0.7.0

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

diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
new file mode 100644
index 000000000000..51b523c010aa
--- /dev/null
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, aria2, poetry, pytest, pytestcov, pytest_xdist, responses
+, asciimatics, loguru, requests, setuptools, websocket_client
+}:
+
+buildPythonPackage rec {
+  pname = "aria2p";
+  version = "0.7.0";
+  format = "pyproject";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "pawamoy";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6";
+  };
+  
+  nativeBuildInputs = [ poetry ];
+
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+
+  checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ];
+
+  # Tests are not all stable/deterministic,
+  # they rely on actually running an aria2c daemon and communicating with it,
+  # race conditions and deadlocks were observed,
+  # thus the corresponding tests are disabled
+  checkPhase = ''
+    pytest -nauto -k "not test_api and not test_cli and not test_interface"
+  '';
+
+  propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/pawamoy/aria2p";
+    description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC";
+    license = licenses.isc;
+    maintainers = with maintainers; [ koral ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0f46503d692..df480391e13d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -187,6 +187,8 @@ in {
 
   argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };
 
+  aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2 poetry; };
+
   arviz = callPackage ../development/python-modules/arviz { };
 
   asana = callPackage ../development/python-modules/asana { };

From 4acf0beba1b7ab811052241d3375e74756b61bdf Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 24 Jan 2020 22:19:41 +0100
Subject: [PATCH 626/755] python3Packages.zodb: fix compatibility with
 transaction 3.0

zodb build broke with the python3Packages.transaction upgrade that
happened in f054f498400b285f0893727a2c039c802d771925.
---
 pkgs/development/python-modules/zodb/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index c79352085368..f15cefaa4757 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchPypi
+, fetchpatch
 , buildPythonPackage
 , python
 , zope_testrunner
@@ -23,6 +24,14 @@ buildPythonPackage rec {
       sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666";
     };
 
+    patches = [
+      # Compatibility with transaction v3.0
+      (fetchpatch {
+        url = "https://github.com/zopefoundation/ZODB/commit/0adcc6877f690186c97cc5da7e13788946d5e0df.patch";
+        sha256 = "1zmbgm7r36nj5w7icpinp61fm81svh2wk213pzr3l0jxzr9i5qi4";
+      })
+    ];
+
     # remove broken test
     postPatch = ''
       rm -vf src/ZODB/tests/testdocumentation.py

From 7680df12c53e715ef767d42df7dcd1c947534683 Mon Sep 17 00:00:00 2001
From: Jelle Besseling <jelle@pingiun.com>
Date: Fri, 24 Jan 2020 20:37:46 +0100
Subject: [PATCH 627/755] python-telegram-bot: fix vendored urllib patches

---
 .../development/python-modules/python-telegram-bot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 113422374790..86a8cd71f5b0 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -23,7 +23,8 @@ buildPythonPackage rec {
       --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \
       --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"
+      --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \
+      --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField"
 
     touch LICENSE.dual
   '';

From d7cdc485022ff93655fee9a4a26372c2f9b58329 Mon Sep 17 00:00:00 2001
From: Jelle Besseling <jelle@pingiun.com>
Date: Fri, 24 Jan 2020 20:38:27 +0100
Subject: [PATCH 628/755] python-telegram-bot: add pingiun as maintainer

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

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 86a8cd71f5b0..9b70d76bfed7 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "This library provides a pure Python interface for the Telegram Bot API.";
     homepage = https://python-telegram-bot.org;
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ veprbl ];
+    maintainers = with maintainers; [ veprbl pingiun ];
   };
 }

From 0e1259aa1228c5f72fb1fc9394fe654b5e59e796 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 24 Jan 2020 18:18:18 -0500
Subject: [PATCH 629/755] flow: 0.116.1 -> 0.117.0

Changelog: https://github.com/facebook/flow/releases/tag/v0.117.0
---
 pkgs/development/tools/analysis/flow/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 2d2c3b0274d7..c0b9dff31830 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices, fetchpatch }:
+{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.116.1";
+  version = "0.117.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "19j2zw8ajky04d2ayfzj99yz805igip1ql3i4v7bblamc8sk38cn";
+    sha256 = "1s3qlq0jfx94fr7vzzc7jw8l5mvsrrxhq9mcf50aq0ipz0fz0il9";
   };
 
   installPhase = ''
@@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
   buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
-  patches = [
-    # Fix List.compare labeled argument. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/facebook/flow/commit/d061b38042327d8241fb6dec7c8307c86b2f23d6.patch";
-      sha256 = "1rmkb1zldgm2y2n32nm2xd8c7wk3hccsbljjz6bm6a0yixa6w77l";
-    })
-  ];
-
   meta = with stdenv.lib; {
     description = "A static type checker for JavaScript";
     homepage = https://flow.org/;

From 9a88d2248b796a3fc557b3746470bc2a0dff9c09 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Fri, 24 Jan 2020 21:07:09 +0100
Subject: [PATCH 630/755] tangogps: drop at 0.99.2

tangogps is abandoned. It looks like it this is the case since the early
2010s. foxtrotgps is a fork, that still is maintained.
---
 pkgs/applications/misc/tangogps/default.nix | 46 ---------------------
 pkgs/top-level/all-packages.nix             |  4 --
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/applications/misc/tangogps/default.nix

diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
deleted file mode 100644
index 10b487828ea5..000000000000
--- a/pkgs/applications/misc/tangogps/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf
-, curl, libexif, sqlite, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "tangogps-0.99.2";
-
-  src = fetchurl {
-    url = "http://www.tangogps.org/downloads/${name}.tar.gz";
-    sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
-  NIX_LDFLAGS = "-lm";
-
-  # bogus includes fail with newer library version
-  postPatch = ''
-    sed -i -e 's,#include <glib/.*>,#include <glib.h>,g' src/*.c
-    sed -i -e 's,#include <curl/.*>,#include <curl/curl.h>,g' src/*.c src/*.h
-  '';
-
-  meta = {
-    description = "User friendly map and GPS user interface";
-
-    longDescription = ''
-      tangoGPS is an easy to use, fast and lightweight mapping
-      application for use with or without GPS.
-
-      It runs on any Linux platform from the desktop over eeePC down
-      to phones like the Openmoko Neo.
-
-      By default tangoGPS uses map data from the OpenStreetMap
-      project.  Additionally a variety of other repositories can be
-      easily added.
-
-      The maps are automagically downloaded and cached for offline use
-      while you drag or zoom the map.  Furthermore you can
-      conveniently pre-cache areas with tangoGPS.
-    '';
-
-    #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee74eb17f311..b75b39b833cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21599,10 +21599,6 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tangogps = callPackage ../applications/misc/tangogps {
-    gconf = gnome2.GConf;
-  };
-
   tambura = callPackage ../applications/audio/tambura { };
 
   teams = callPackage ../applications/networking/instant-messengers/teams { };

From 6d46f05945a27953bc95f95715b002db442db120 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sat, 25 Jan 2020 04:09:03 +0900
Subject: [PATCH 631/755] pythonPackages.llfuse: darwin support via osxfuse

---
 .../python-modules/llfuse/default.nix         | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 6a4973584044..02adb5a8d161 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
-, contextlib2
+{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
+, contextlib2, osxfuse
 }:
 
+let
+  inherit (stdenv.lib) optionals optionalString;
+in
+
 buildPythonPackage rec {
   pname = "llfuse";
   version = "1.3.6";
@@ -11,14 +15,29 @@ buildPythonPackage rec {
     sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
   };
 
+  patches = [
+    # https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits)
+    (fetchpatch {
+      url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff";
+      sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0";
+    })
+    (fetchpatch {
+      url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff";
+      sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse ];
-  checkInputs = [ pytest attr which ];
+  buildInputs =
+    optionals stdenv.isLinux [ fuse ]
+    ++ optionals stdenv.isDarwin [ osxfuse ];
+  checkInputs = [ pytest which ] ++
+    optionals stdenv.isLinux [ attr ];
 
   propagatedBuildInputs = [ contextlib2 ];
 
   checkPhase = ''
-    py.test -k "not test_listdir"
+    py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
   '';
 
   meta = with stdenv.lib; {

From 128db1b3f0d398d9fcebaaae1003159ee0790544 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sat, 25 Jan 2020 04:09:23 +0900
Subject: [PATCH 632/755] borgbackup: use llfuse on darwin

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

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 593056f403ed..ed8fbbf76cd7 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
     libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
   ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
   propagatedBuildInputs = with python3.pkgs; [
-    cython
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
+    cython llfuse
+  ];
 
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl.dev}"

From d47671b9f6a826e00d88e6e9f107ad0a28e09b8c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 00:00:00 -0500
Subject: [PATCH 633/755] bitcoin: fix build on darwin

---
 pkgs/applications/blockchains/bitcoin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index 2fa8ea6467c1..c1143f898e28 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump
 , zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
 , withGui }:
 
@@ -31,6 +31,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs =
     [ pkgconfig autoreconfHook ]
+    ++ optional stdenv.isDarwin hexdump
     ++ optional withGui wrapQtAppsHook;
   buildInputs = [ openssl db48 boost zlib zeromq
                   miniupnpc libevent]
@@ -75,7 +76,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.bitcoin.org/;
     maintainers = with maintainers; [ roconnor AndersonTorres ];
     license = licenses.mit;
-    # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment.
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 10e95cc02127db513de2d2cdfeb7b874eddc8878 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 25 Jan 2020 16:45:15 +0800
Subject: [PATCH 634/755] minecraft: 2.1.9618 -> 2.1.11314

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

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index f71a0e4fd20e..07dbc0f4cf91 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -84,11 +84,11 @@ in
  stdenv.mkDerivation rec {
   pname = "minecraft-launcher";
 
-  version = "2.1.9618";
+  version = "2.1.11314";
 
   src = fetchurl {
     url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
-    sha256 = "1wk7414i9n6yvhhc0g3cpqjs4ryklmdp2pxgvfdg9zibjdx0avvy";
+    sha256 = "1wd3zh91zamlpgnqlk7sq3xja2g5qz34amy4v8yhdxkhj79plwhg";
   };
 
   icon = fetchurl {

From a84047b0c7f5e5299cca403ed2c0696c3796929f Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 25 Jan 2020 16:57:06 +0800
Subject: [PATCH 635/755] minecraft: no `GPUCache` in current directory

---
 pkgs/games/minecraft/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index f71a0e4fd20e..7baabf5a43db 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -112,7 +112,8 @@ in
 
     makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
       --prefix LD_LIBRARY_PATH : ${envLibPath} \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
+      --run "cd /tmp" # Do not create `GPUCache` in current directory
   '';
 
   preFixup = ''

From d097edb4bbee4d3efc96481f473f38819e85f421 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 04:20:00 -0500
Subject: [PATCH 636/755] python3Packages.altair: fix build

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

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 9cb362a7bd16..db3c2d27c8b6 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
 
   checkPhase = ''
     export LANG=en_US.UTF-8
+    # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags
+    rm altair/examples/histogram_responsive.py
     pytest --doctest-modules altair
   '';
 

From 2648d2b6169b5a863105a2a5bfe8b475e238bd25 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 04:20:00 -0500
Subject: [PATCH 637/755] python37Packages.apache-airflow: fix build

---
 pkgs/development/python-modules/apache-airflow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index c15aac61b5c0..7bb805e4f35d 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -154,6 +154,7 @@ buildPythonPackage rec {
      --replace "text-unidecode==1.2" "text-unidecode" \
      --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \
      --replace "sqlalchemy~=1.3" "sqlalchemy" \
+     --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \
      --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
  
   # dumb-init is only needed for CI and Docker, not relevant for NixOS.

From 1a69fd33df842b550ecc96b43de6c18140713f8a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 04:20:00 -0500
Subject: [PATCH 638/755] flexget: 3.1.11 -> 3.1.13

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 7879fe5d8166..8c381df122d8 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FlexGet";
-  version = "3.1.11";
+  version = "3.1.13";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0ff053e4f9e01334ffb2f4a45590fe0e3e49dd2c21ae19d433c63dcbfe618a01";
+    sha256 = "51215f71ed2d2666313c7965a2b22b5463b4a51f319d64db61f6a4fd221e124e";
   };
 
   postPatch = ''

From c6e8760b4a2eb64cfe2c6b9fdc758bbdc12ab349 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 04:30:00 -0500
Subject: [PATCH 639/755] pythonPackages.loguru: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index ceb9f841a461..c12084f008ec 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -2,18 +2,18 @@
 
 buildPythonPackage rec {
   pname = "loguru";
-  version = "0.4.0";
+  version = "0.4.1";
   
   disabled = isPy27;
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748";
+    sha256 = "a6101fd435ac89ba5205a105a26a6ede9e4ddbb4408a6e167852efca47806d11";
   };
 
   checkInputs = [ pytestCheckHook colorama ];
 
   disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/Delgan/loguru;

From fdb5f5d827adfc7394823704226a0849c2a30d3c Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Sat, 25 Jan 2020 10:34:17 +0100
Subject: [PATCH 640/755] unoconv: fixing sha256

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

diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix
index 380b172f7024..aed7554e1704 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/pkgs/tools/text/unoconv/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "unoconv";
     repo = "unoconv";
     rev = version;
-    sha256 = "0ix605lk0k3hv241jb2kf4jq5744q2wh9x0pzkmay5m126vv8kq4";
+    sha256 = "0mxrzzg9bl42lsiw8hcq624qbq8jrhcgmnal7ys68dj0l901snk3";
   };
 
   buildInputs = [ asciidoc makeWrapper ];

From cb6e9970edc676b560c927bd665c3f401f20ed0e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 25 Jan 2020 00:33:31 +0100
Subject: [PATCH 641/755] range-v3: Fix the AArch64 build by disabling the
 tests

Another reference for working AArch64 builds:
https://git.alpinelinux.org/aports/tree/community/range-v3/APKBUILD

Co-Authored-By: Ilya Fedin <fedin-ilja2010@ya.ru>
---
 pkgs/development/libraries/range-v3/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 56c5754831ef..ca2c7d9b70fb 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  doCheck = true;
+  # Building the tests currently fails on AArch64 due to internal compiler
+  # errors (with GCC 9.2):
+  cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
+
+  doCheck = !stdenv.isAarch64;
   checkTarget = "test";
 
   enableParallelBuilding = true;

From 3db6b0fbd778493f5ba608716a5c4a00270c3df1 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 25 Jan 2020 12:05:20 +0100
Subject: [PATCH 642/755] mindustry: 102 -> 103

---
 pkgs/games/mindustry/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 0b3824f2ec82..6e6d6b56014f 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -19,14 +19,14 @@ let
   # Note: when raising the version, ensure that all SNAPSHOT versions in
   # build.gradle are replaced by a fixed version
   # (the current one at the time of release) (see postPatch).
-  version = "102";
+  version = "103";
   buildVersion = makeBuildVersion version;
 
   src = fetchFromGitHub {
     owner = "Anuken";
     repo = "Mindustry";
     rev = "v${version}";
-    sha256 = "0g4zy2zlynv6f427pq1ngnl0zpr6nnih10wd2l8vl9bxwzjygwdr";
+    sha256 = "0s9pzmnq2v3glbmb6kqifar62wi44z4sg14dnayyj0fjkx6sh05s";
   };
 
   desktopItem = makeDesktopItem {
@@ -65,7 +65,7 @@ let
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "1sscxrr32f2agwz34pm491xqkz7m4bwdc1p3g64kcnl3p6rg7r7k";
+    outputHash = "16k058fw9yk89adx8j1708ynfri5yizmmvh49prls9slw4hipffb";
   };
 
 in stdenv.mkDerivation rec {

From 21ae4ae8795f8cd06421a123dbb5ddaea9bb219c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 25 Jan 2020 13:37:06 +0100
Subject: [PATCH 643/755] weston: 7.0.0 -> 8.0.0 (#78464)

Announcement:
https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html
---
 pkgs/applications/window-managers/weston/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 34ad2bcc732f..51da999aff0c 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -10,11 +10,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "weston";
-  version = "7.0.0";
+  version = "8.0.0";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0";
+    sha256 = "0j3q0af3595g4wcicldgy749zm2g2b6bswa6ya8k075a5sdv863m";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
     "-Dremoting=false" # TODO
     "-Dpipewire=${boolToString (pipewire != null)}"
     "-Dimage-webp=${boolToString (libwebp != null)}"
-    "-Dsimple-dmabuf-drm=" # Disables all drivers
     "-Ddemo-clients=false"
     "-Dsimple-clients="
     "-Dtest-junit-xml=false"
@@ -43,6 +42,8 @@ stdenv.mkDerivation rec {
     "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
   ];
 
+  passthru.providedSessions = [ "weston" ];
+
   meta = {
     description = "Reference implementation of a Wayland compositor";
     homepage = https://wayland.freedesktop.org/;

From 1ee3c7b405f669dea3328f71249e7ef74823fc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 25 Jan 2020 13:38:07 +0100
Subject: [PATCH 644/755] Revert "knot-resolver: skip a broken test"

This reverts commit 5c0567dcc688ee0663e06393b0f7ac02a1724738.
The issue had been fixed but I forgot to remove this workaround.
---
 pkgs/servers/dns/knot-resolver/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index d996d646d227..953d8ebcbae6 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -30,9 +30,6 @@ unwrapped = stdenv.mkDerivation rec {
     sha256 = "0ca0f171ae2b2d76830967a5150eb0fa496b48b2a48f41b2be65d3743aaece25";
   };
 
-  # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
-  postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build";
-
   outputs = [ "out" "dev" ];
 
   preConfigure = ''

From 55250aae72c0dc01e834c1501ec0b546f4765558 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 25 Jan 2020 16:09:45 +0100
Subject: [PATCH 645/755] direnv: 2.20.1 -> 2.21.0

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 22c0721d79d8..77eca6af33c8 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   pname = "direnv";
-  version = "2.20.1";
+  version = "2.21.0";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "0v8mqxb5g8z9kdnvbwfg39hlb9l3wpb8qwslwgln42k4bs8kg9hs";
+    sha256 = "0k0sh8pzpxix8sjhnvj2h3s6br32daj3mgac0i2bbzvmil77l2sb";
   };
 
   postConfigure = ''

From ad3f0d9829119b611350a9be1c226fb625f1f310 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 25 Jan 2020 17:25:12 +0100
Subject: [PATCH 646/755] dnscrypt-proxy2: 2.0.25 -> 2.0.36

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
index b9df976d3a9f..5c5cb7333ddc 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "dnscrypt-proxy2";
-  version = "2.0.25";
+  version = "2.0.36";
 
   goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "jedisct1";
     repo = "dnscrypt-proxy";
     rev = version;
-    sha256 = "1ix76nihzjbiib7n2pjx2ynziz8hrrx3idwdjnkwckxfq11g96y3";
+    sha256 = "05pk0fl4cyh69lfssvx9prd2gg0akw1l14b4q76zfhh9vc47z6x1";
   };
 
   meta = with stdenv.lib; {

From 645a816f6f089e742c46659fd91a7db8c1df9224 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Sat, 25 Jan 2020 08:53:00 -0800
Subject: [PATCH 647/755] swiftformat: init at 0.44.0

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

diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix
new file mode 100644
index 000000000000..e87728b1a30e
--- /dev/null
+++ b/pkgs/development/tools/swiftformat/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, runCommand }:
+
+# This derivation is impure: it relies on an Xcode toolchain being installed
+# and available in the expected place. The values of sandboxProfile and
+# hydraPlatforms are copied pretty directly from the MacVim derivation, which
+# is also impure.
+
+stdenv.mkDerivation rec {
+  pname = "swiftformat";
+  version = "0.44.0";
+
+  src = fetchFromGitHub {
+    owner = "nicklockwood";
+    repo = "SwiftFormat";
+    rev = "${version}";
+    sha256 = "13s6syzpxklkv07s1dzdccnqz6p316rrhjpxg8y8dy19ynj5jzvg";
+  };
+
+  preConfigure = "LD=$CC";
+
+  buildPhase = ''
+    /usr/bin/xcodebuild -project SwiftFormat.xcodeproj \
+      -scheme "SwiftFormat (Command Line Tool)" \
+      CODE_SIGN_IDENTITY= SYMROOT=build OBJROOT=build
+  '';
+
+  installPhase = ''
+    install -D -m 0555 build/Release/swiftformat $out/bin/swiftformat
+  '';
+
+  sandboxProfile = ''
+    (allow file-read* file-write* process-exec mach-lookup)
+    ; block homebrew dependencies
+    (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log))
+  '';
+
+  meta = with lib; {
+    description = "A code formatting and linting tool for Swift";
+    homepage = "https://github.com/nicklockwood/SwiftFormat";
+    license = licenses.mit;
+    maintainers = [ maintainers.bdesham ];
+    platforms = platforms.darwin;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01275b028667..e0dd23305f10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10676,6 +10676,8 @@ in
 
   swarm = callPackage ../development/tools/analysis/swarm { };
 
+  swiftformat = callPackage ../development/tools/swiftformat { };
+
   swig1 = callPackage ../development/tools/misc/swig { };
   swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
   swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };

From 2edf9a03325f0b29a217900af9785a6bfee9e5cf Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 20:55:00 +0100
Subject: [PATCH 648/755] luarocks-nix: fix generation when missing license

vstruct rockspec doesnt contain a license, which made luarocks-nix
crash. Bump luarocks nix to fix this.
---
 pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 21611f05579b..57f200fd0fcb 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -4,9 +4,9 @@ luarocks.overrideAttrs(old: {
   version = "2019-09-07";
   src = fetchFromGitHub {
     owner = "nix-community";
-    repo = "luarocks";
-    rev = "fa7c367bcdad36768db5f19fd4fcdd9681a14429";
-    sha256 = "0kziwfw5gqq5xsckl7qf9wasaiy8rp42h5qrcnjx07qp47a9ldx7";
+    repo = "luarocks-nix";
+    rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde";
+    sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y";
   };
   patches = [
     ./darwin-3.1.3.patch

From 460224d4cd350e6a77dcbc6dc233d7ffb933b2c3 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 20:58:00 +0100
Subject: [PATCH 649/755] luaPackages.luaepnf: init at 0.3-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index f9b74b279e8f..73de7b518dbb 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -44,6 +44,7 @@ luadbi-mysql,,,,,
 luadbi-postgresql,,,,,
 luadbi-sqlite3,,,,,
 luadoc,,,,,
+luaepnf,,,,,
 luaevent,,,,,
 luaexpat,,,1.3.0-1,,arobyn flosse
 luaffi,,http://luarocks.org/dev,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d1e72b41cdd5..3e01b2f97577 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -933,9 +933,24 @@ luadoc = buildLuarocksPackage {
   meta = with stdenv.lib; {
     homepage = "http://luadoc.luaforge.net/";
     description = "LuaDoc is a documentation tool for Lua source code";
-    license = {
-      fullName = "MIT/X11";
-    };
+    license.fullName = "MIT/X11";
+  };
+};
+luaepnf = buildLuarocksPackage {
+  pname = "luaepnf";
+  version = "0.3-1";
+
+  src = fetchurl {
+    url    = mirror://luarocks/luaepnf-0.3-1.src.rock;
+    sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua lpeg ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://siffiejoe.github.io/lua-luaepnf/";
+    description = "Extended PEG Notation Format (easy grammars for LPeg)";
+    license.fullName = "MIT";
   };
 };
 luaevent = buildLuarocksPackage {

From a032a3ad90f7794977c10a95141e424b8211ecd9 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 20:58:58 +0100
Subject: [PATCH 650/755] luaPackages.luarepl: init at 0.9-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 73de7b518dbb..ceb47f57db56 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -52,6 +52,7 @@ luafilesystem,,,1.7.0-2,,flosse vcunat
 lualogging,,,,,
 luaossl,,,,lua5_1,vcunat
 luaposix,,,,,vyp lblasc
+luarepl,,,,,
 luasec,,,,,flosse
 luasocket,,,,,
 luasql-sqlite3,,,,,vyp
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 3e01b2f97577..eaa0f41aadbe 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1083,9 +1083,30 @@ luaposix = buildLuarocksPackage {
     homepage = "https://github.com/luaposix/luaposix/";
     description = "Lua bindings for POSIX";
     maintainers = with maintainers; [ vyp lblasc ];
-    license = {
-      fullName = "MIT/X11";
-    };
+    license.fullName = "MIT/X11";
+  };
+};
+luarepl = buildLuarocksPackage {
+  pname = "luarepl";
+  version = "0.9-1";
+
+  knownRockspec = (fetchurl {
+    url    = mirror://luarocks/luarepl-0.9-1.rockspec;
+    sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z";
+  }).outPath;
+
+  src = fetchurl {
+    url    = https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz;
+    sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w";
+  };
+
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/hoelzro/lua-repl";
+    description = "A reusable REPL component for Lua, written in Lua";
+    license.fullName = "MIT/X11";
   };
 };
 luasec = buildLuarocksPackage {

From 84a2134baad9859f6a9fab88edd1a22437ba600a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 21:19:22 +0100
Subject: [PATCH 651/755] luaPackages.vstruct: init at 2.0.2-1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index ceb47f57db56..01e3150ede13 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -75,3 +75,4 @@ std__debug,std._debug,,,,
 std_normalize,std.normalize,,,,
 stdlib,,,,,vyp
 pulseaudio,,,,,doronbehar
+vstruct,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index eaa0f41aadbe..9afd8ab6a6ef 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1536,9 +1536,23 @@ stdlib = buildLuarocksPackage {
     homepage = "http://lua-stdlib.github.io/lua-stdlib";
     description = "General Lua Libraries";
     maintainers = with maintainers; [ vyp ];
-    license = {
-      fullName = "MIT/X11";
-    };
+    license.fullName = "MIT/X11";
+  };
+};
+vstruct = buildLuarocksPackage {
+  pname = "vstruct";
+  version = "2.0.2-1";
+
+  src = fetchurl {
+    url    = mirror://luarocks/vstruct-2.0.2-1.src.rock;
+    sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq";
+  };
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
+  propagatedBuildInputs = [ lua ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ToxicFrog/vstruct";
+    description = "Lua library to manipulate binary data";
   };
 };
 

From 27c88c51e70d63e28bec35df27c3db4baead6d33 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 24 Jan 2020 21:20:26 +0100
Subject: [PATCH 652/755] update-luarocks-packages: disable by default

Not only the binary `parallel` displays a re,inder to quote their
software but it systematically breaks update here regardless of my
network quality.
Better be slow than fail. If anyone can fix it, we may rollback this.
---
 maintainers/scripts/update-luarocks-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index 1a31d71086fa..5c42080745eb 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -19,7 +19,7 @@ export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
 
 # 10 is a pretty arbitrary number of simultaneous jobs, but it is generally
 # impolite to hit a webserver with *too* many simultaneous connections :)
-PARALLEL_JOBS=10
+PARALLEL_JOBS=1
 
 exit_trap() {
     local lc="$BASH_COMMAND" rc=$?

From ea77cad56976f554bde3ef7d718de78a63eb7b50 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 25 Jan 2020 22:54:37 +0300
Subject: [PATCH 653/755] Revert "Added support for libfprint 1.90"

This reverts commit b60d5692bf44337bc2081caf634ac3b60a8512e5.
---
 .../libraries/libfprint/default.nix           | 42 +++++++++++++------
 pkgs/tools/security/fprintd/default.nix       | 14 ++++---
 pkgs/top-level/aliases.nix                    |  2 -
 pkgs/top-level/all-packages.nix               |  6 +++
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 6819ffba21c3..9a6db72ae058 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,27 +1,41 @@
-{ stdenv
+{ thinkpad ? false
+, stdenv
+, fetchFromGitHub
 , fetchurl
 , pkgconfig
 , meson
 , ninja
-, gusb
+, libusb
 , pixman
 , glib
 , nss
-, gobject-introspection
+, gtk3
 , coreutils
 , gtk-doc
 , docbook_xsl
 , docbook_xml_dtd_43
+, openssl ? null
 }:
 
-stdenv.mkDerivation rec {
-  pname = "libfprint";
-  version = "1.90";
+assert thinkpad -> openssl != null;
 
-  src = fetchurl {
-    url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
-    sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
-  };
+stdenv.mkDerivation rec {
+  pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
+  version = "1.0";
+
+  src = {
+    libfprint-thinkpad =
+      fetchFromGitHub {
+        owner = "3v1n0";
+        repo = "libfprint";
+        rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c";
+        sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
+      };
+    libfprint = fetchurl {
+      url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
+      sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
+    };
+  }.${pname};
 
   nativeBuildInputs = [
     pkgconfig
@@ -30,15 +44,17 @@ stdenv.mkDerivation rec {
     gtk-doc
     docbook_xsl
     docbook_xml_dtd_43
-    gobject-introspection
   ];
 
   buildInputs = [
-    gusb
+    libusb
     pixman
     glib
     nss
-  ];
+    gtk3
+  ]
+  ++ stdenv.lib.optional thinkpad openssl
+  ;
 
   mesonFlags = [
     "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index 13e6c0be391a..41a00306f695 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -1,9 +1,11 @@
-{ stdenv
+{ thinkpad ? false
+, stdenv
 , fetchurl
 , fetchpatch
 , pkgconfig
 , intltool
-, libfprint
+, libfprint-thinkpad ? null
+, libfprint ? null
 , glib
 , dbus-glib
 , polkit
@@ -15,7 +17,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "fprintd";
+  pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
   version = "0.9.0";
 
   src = fetchurl {
@@ -44,8 +46,10 @@ stdenv.mkDerivation rec {
     nss
     pam
     systemd
-    libfprint
-  ];
+  ]
+  ++ stdenv.lib.optional thinkpad libfprint-thinkpad
+  ++ stdenv.lib.optional (!thinkpad) libfprint
+  ;
 
   configureFlags = [
     # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3831db8d4017..2e94b0167b8d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -126,7 +126,6 @@ mapAliases ({
   '';
   font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
   foomatic_filters = foomatic-filters;  # 2016-08
-  fprintd-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
   fuse_exfat = exfat;                   # 2015-09-11
   fuseki = apache-jena-fuseki; # added 2018-04-25
   fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
@@ -213,7 +212,6 @@ mapAliases ({
   liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
   liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
   liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
-  libfprint-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
   libgumbo = gumbo; # added 2018-01-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 827f5fb9cd65..99020dc38658 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3394,6 +3394,9 @@ in
   fprot = callPackage ../tools/security/fprot { };
 
   fprintd = callPackage ../tools/security/fprintd { };
+  fprintd-thinkpad = fprintd.override {
+    thinkpad = true;
+  };
 
   franz = callPackage ../applications/networking/instant-messengers/franz { };
 
@@ -12474,6 +12477,9 @@ in
   };
 
   libfprint = callPackage ../development/libraries/libfprint { };
+  libfprint-thinkpad = libfprint.override {
+    thinkpad = true;
+  };
 
   libfpx = callPackage ../development/libraries/libfpx { };
 

From 337662855748ebd4f8dbc05c54ca797aa36934e4 Mon Sep 17 00:00:00 2001
From: samlich <1349989+samlich@users.noreply.github.com>
Date: Sat, 25 Jan 2020 19:58:36 +0000
Subject: [PATCH 654/755] pymol: cleanup

---
 pkgs/applications/science/chemistry/pymol/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index a0e1fa5a3aef..e8b3b23ddd9d 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -29,7 +29,8 @@ python3Packages.buildPythonApplication rec {
   };
 
   buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack ];
-  NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2 -Wno-error=format-security";
+  NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
+  hardeningDisable = [ "format" ];
 
   setupPyBuildFlags = [ "--glut" ];
 
@@ -47,10 +48,10 @@ python3Packages.buildPythonApplication rec {
     cp -r "${desktopItem}/share/applications/" "$out/share/"
   '';
 
-  meta = {
+  meta = with lib; {
     description = description;
     homepage = https://www.pymol.org/;
-    license = lib.licenses.psfl;
-    maintainers = with lib.maintainers; [ samlich ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ samlich ];
   };
 }

From 22a1deaf2cebf6f9a9be26b0e49c91750a574043 Mon Sep 17 00:00:00 2001
From: Karl Fischer <fishi0x01@gmail.com>
Date: Sat, 25 Jan 2020 21:24:59 +0100
Subject: [PATCH 655/755] add maintainer: fishi0x01

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1f0ead51af15..e5b7ce05fe77 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2399,6 +2399,12 @@
     githubId = 415760;
     name = "Jonas Höglund";
   };
+  fishi0x01 = {
+    email = "fishi0x01@gmail.com";
+    github = "fishi0x01";
+    githubId = 10799507;
+    name = "Karl Fischer";
+  };
   Flakebi = {
     email = "flakebi@t-online.de";
     github = "Flakebi";

From 6e83d1687eb1b5ed59b2a7611832a87821f30700 Mon Sep 17 00:00:00 2001
From: Karl Fischer <fishi0x01@gmail.com>
Date: Sat, 25 Jan 2020 21:25:44 +0100
Subject: [PATCH 656/755] enum4linux: init at 0.8.9

---
 pkgs/tools/security/enum4linux/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/security/enum4linux/default.nix

diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/tools/security/enum4linux/default.nix
new file mode 100644
index 000000000000..9a7d1861d9bd
--- /dev/null
+++ b/pkgs/tools/security/enum4linux/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, makeWrapper, samba, perl, openldap }:
+
+stdenv.mkDerivation rec {
+  pname = "enum4linux";
+  version = "0.8.9";
+  src = fetchurl {
+    url = "https://labs.portcullis.co.uk/download/enum4linux-${version}.tar.gz";
+    sha256 = "41334df0cb1ba82db9e3212981340372bb355a8160073331d2a1610908a62d85";
+  };
+
+  dontBuild = true;
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ samba perl openldap ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp enum4linux.pl $out/bin/enum4linux
+
+    wrapProgram $out/bin/enum4linux \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for enumerating information from Windows and Samba systems";
+    homepage = "https://labs.portcullis.co.uk/tools/enum4linux/";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fishi0x01 ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bf7da13c36a..c832e2743187 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -179,6 +179,8 @@ in
 
   deviceTree = callPackage ../os-specific/linux/device-tree {};
 
+  enum4linux = callPackage ../tools/security/enum4linux {};
+
   device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
 
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;

From 57092f7ef17adfca9817f0ad9d713e1c5114ddff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Mon, 20 Jan 2020 07:51:57 +0000
Subject: [PATCH 657/755] fluxus: init at 0.19

---
 pkgs/applications/graphics/fluxus/default.nix | 96 +++++++++++++++++++
 .../graphics/fluxus/fix-build.patch           | 16 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 114 insertions(+)
 create mode 100644 pkgs/applications/graphics/fluxus/default.nix
 create mode 100644 pkgs/applications/graphics/fluxus/fix-build.patch

diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix
new file mode 100644
index 000000000000..a80940711013
--- /dev/null
+++ b/pkgs/applications/graphics/fluxus/default.nix
@@ -0,0 +1,96 @@
+{ stdenv
+, fetchFromGitLab
+, alsaLib
+, bzip2
+, fftw
+, freeglut
+, freetype
+, glew
+, libjack2
+, libGL
+, libGLU
+, libjpeg
+, liblo
+, libpng
+, libsndfile
+, libtiff
+, ode
+, openal
+, openssl
+, racket
+, scons
+, zlib
+}:
+let
+  libs = [
+    alsaLib
+    bzip2
+    fftw
+    freeglut
+    freetype
+    glew
+    libjack2
+    libGL
+    libGLU
+    libjpeg
+    liblo
+    libpng
+    libsndfile
+    libtiff
+    ode
+    openal
+    openssl
+    zlib
+  ];
+in
+stdenv.mkDerivation rec {
+  pname = "fluxus";
+  version = "0.19";
+  src = fetchFromGitLab {
+    owner = "nebogeo";
+    repo = "fluxus";
+    rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400";
+    hash = "sha256:0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
+  };
+
+  buildInputs = [
+    alsaLib
+    fftw
+    freeglut.dev
+    freetype
+    glew
+    libjack2
+    libjpeg.dev
+    liblo
+    libsndfile.dev
+    libtiff.dev
+    ode
+    openal
+    openssl.dev
+    racket
+  ];
+  nativeBuildInputs = [ scons ];
+
+  patches = [ ./fix-build.patch ];
+  sconsFlags = [
+    "RacketPrefix=${racket}"
+    "RacketInclude=${racket}/include/racket"
+    "RacketLib=${racket}/lib/racket"
+    "LIBPATH=${stdenv.lib.makeLibraryPath libs}"
+    "DESTDIR=build"
+  ];
+  configurePhase = ''
+    sconsFlags+=" Prefix=$out"
+  '';
+  installPhase = ''
+    mkdir -p $out
+    cp -r build$out/* $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Livecoding environment for 3D graphics, sound, and games";
+    license = licenses.gpl2;
+    homepage = http://www.pawfal.org/fluxus/;
+    maintainers = [ maintainers.brainrape ];
+  };
+}
diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/applications/graphics/fluxus/fix-build.patch
new file mode 100644
index 000000000000..7810dd59e357
--- /dev/null
+++ b/pkgs/applications/graphics/fluxus/fix-build.patch
@@ -0,0 +1,16 @@
+diff --git a/SConstruct b/SConstruct
+index 32cb644..0b3a208 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -225,6 +225,11 @@ if env['PLATFORM'] == 'posix':
+                     ["asound", "alsa/asoundlib.h"],
+                     ["openal", "AL/al.h"]]
+
++env.Append(ENV={'PATH': ' ' + os.environ['PATH'], })
++env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':'))
++env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE',''))
++env.Append(CCFLAGS=' -DNULL=0')
++
+ ################################################################################
+ # Make sure we have these libraries availible
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bf3a79f2636..24c3c339b52c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18919,6 +18919,8 @@ in
 
   flrig = callPackage ../applications/radio/flrig { };
 
+  fluxus = callPackage ../applications/graphics/fluxus { };
+
   flwrap = callPackage ../applications/radio/flwrap { };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {

From 21160c8965e3a2523dcefc2847893c2e2f4c7282 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 25 Jan 2020 21:51:35 +0100
Subject: [PATCH 658/755] mumble: Fix PLUGIN_PATH definition so it can find the
 CELT library

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index dfb49e14133f..fc2f911df9ed 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -37,12 +37,12 @@ let
       "CONFIG+=bundled-celt"
       "CONFIG+=no-bundled-opus"
       "CONFIG+=no-bundled-speex"
+      "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble"
     ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
       ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
       ++ (overrides.configureFlags or [ ]);
 
     preConfigure = ''
-       qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble"
        patchShebangs scripts
     '';
 

From cae1bf667f372e9b89f5230ba7395aeed7f2ad8b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 25 Jan 2020 22:05:14 +0100
Subject: [PATCH 659/755] mumble: Add infinisil as maintainer

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index fc2f911df9ed..86ef850e291e 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -66,7 +66,7 @@ let
       description = "Low-latency, high quality voice chat software";
       homepage = "https://mumble.info";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ petabyteboy ];
+      maintainers = with maintainers; [ petabyteboy infinisil ];
       platforms = platforms.linux;
     };
   });

From 59e7ecdcd0d79c11f1a6bc34bceeaa2ff507f0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 25 Jan 2020 22:16:59 +0100
Subject: [PATCH 660/755] burpsuite: 1.7.36 -> 2.1.07

---
 pkgs/tools/networking/burpsuite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 12885982d26d..cc7fa9ddfb0d 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 let
-  version = "1.7.36";
+  version = "2.1.07";
   jar = fetchurl {
     name = "burpsuite.jar";
     url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
-    sha256 = "12m4fn04yd89r6x4m4yd668p5v0bs9b1h6p239bjj11ykyi3g51a";
+    sha256 = "0811pkxmwl9d58lgqbvyfi2q79ni5w8hs61jycxkvkqxrinpgki3";
   };
   launcher = ''
     #!${runtimeShell}
@@ -35,6 +35,6 @@ in stdenv.mkDerivation {
     license = [ stdenv.lib.licenses.unfree ];
     platforms = jre.meta.platforms;
     hydraPlatforms = [];
-    maintainers = [ stdenv.lib.maintainers.bennofs ];
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
   };
 }

From 58a26351c93b6968b0ead3603951c922371226c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 21 Jan 2020 09:59:07 -0300
Subject: [PATCH 661/755] sane-backends: 1.0.27 -> 1.0.28

---
 .../graphics/sane/backends/default.nix        |  9 +++---
 .../graphics/sane/backends/generic.nix        | 31 ++++++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 4245acf716d5..6aba42d33e63 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -1,11 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.0.27";
+  version = "1.0.28";
+
   src = fetchurl {
-    sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9";
-    urls = [
-      "https://alioth-archive.debian.org/releases/sane/sane-backends/${version}/sane-backends-${version}.tar.gz"
-    ];
+    url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz";
+    sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii";
   };
 })
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 0e8a5f34f6c1..d3e8b417017d 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,6 +1,6 @@
 { stdenv
-, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng
 , gettext, pkgconfig
+, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
 
 # List of { src name backend } attibute sets - see installFirmware below:
 , extraFirmware ? []
@@ -19,14 +19,29 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "doc" "man" ];
 
+  nativeBuildInputs = [
+    gettext
+    pkgconfig
+  ];
+
+  buildInputs = [
+    avahi
+    libgphoto2
+    libieee1284
+    libjpeg
+    libpng
+    libtiff
+    libusb1
+    libv4l
+    net-snmp
+  ];
+
+  enableParallelBuilding = true;
+
   configureFlags = []
     ++ stdenv.lib.optional (avahi != null)   "--enable-avahi"
-    ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
-    ;
-
-  buildInputs = [ avahi libusb1 libv4l net-snmp libpng ];
-  nativeBuildInputs = [ gettext pkgconfig ];
-  enableParallelBuilding = true;
+    ++ stdenv.lib.optional (libusb1 != null) "--with-usb"
+  ;
 
   postInstall = let
 
@@ -71,7 +86,7 @@ stdenv.mkDerivation {
       video- and still-cameras, frame-grabbers, etc. For a list of supported
       scanners, see http://www.sane-project.org/sane-backends.html.
     '';
-    homepage = http://www.sane-project.org/;
+    homepage = "http://www.sane-project.org/";
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ peti ];

From 20bbe6cba68fb9d37b5d0e373b6180dce2961e0d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 25 Jan 2020 15:35:03 -0600
Subject: [PATCH 662/755] vector: 0.6.0 -> 0.7.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/misc/vector/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 18ae7b5e211c..f2fef36f8422 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vector";
-  version = "0.6.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner  = "timberio";
     repo   = pname;
     rev    = "refs/tags/v${version}";
-    sha256 = "0bb4552nwkdpnxhaq2mn4iz5w92ggqxc1b78jq2vjbh1317sj9hw";
+    sha256 = "1bqp1ms8y91mpcmxlc8kyncigxq7spxq1ygy6gviz35zq1cqkwnr";
   };
 
-  cargoSha256 = "1akyzrscc6pv7ggb1kna05vvxhfzrf1b4kji4bah1ry3yyqxdjsj";
+  cargoSha256 = "01hynn8ccpwqrirr1bczqc7q7pqkzfjks2v6q4f32xbm50b31fky";
   buildInputs = [ openssl pkgconfig protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
 

From eb5ec176ce18ce8a25c3d0376d1c8b39ddbb4cea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Jan 2020 23:08:56 +0100
Subject: [PATCH 663/755] bandwhich: 0.10.0 -> 0.11.0

https://github.com/imsnif/bandwhich/releases/tag/0.11.0
---
 pkgs/tools/networking/bandwhich/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index a399e7209af3..4203e0c5c823 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bandwhich";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = pname;
     rev = version;
-    sha256 = "0xq2lv06dx7g00b4amk131krlsb6acsz7b228pn3iz6gy31fhz3y";
+    sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy";
   };
 
   cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";

From bebbc486d01f9aa66e6505c0d3ba8f3505d78934 Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Sat, 25 Jan 2020 16:37:09 -0600
Subject: [PATCH 664/755] Keeps older CoLoR available for older Coq

---
 .../development/coq-modules/CoLoR/default.nix | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index a14eafd7236d..c4a02162fa78 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -1,13 +1,34 @@
 { stdenv, fetchFromGitHub, coq, bignums }:
 
+let
+  coqVersions = {
+    "8.6" = "1.4.0";
+    "8.7" = "1.4.0";
+    "8.8" = "1.6.0";
+    "8.9" = "1.6.0";
+  };
+  params = {
+    "1.4.0" = {
+      version = "1.4.0";
+      rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
+      sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
+    };
+    "1.6.0" = {
+      version = "1.6.0";
+      rev = "328aa06270584b578edc0d2925e773cced4f14c8";
+      sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
+    };
+  };
+  param = params.${coqVersions.${coq.coq-version}};
+in
+
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-CoLoR-1.6.0";
+  name = "coq${coq.coq-version}-CoLoR-${param.version}";
 
   src = fetchFromGitHub {
     owner = "fblanqui";
     repo = "color";
-    rev = "328aa06270584b578edc0d2925e773cced4f14c8";
-    sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
+    inherit (param) rev sha256;
   };
 
   buildInputs = [ coq bignums ];
@@ -17,7 +38,7 @@ stdenv.mkDerivation {
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
 
-  meta = with stdenv.lib ; {
+  meta = with stdenv.lib; {
     homepage = http://color.inria.fr/;
     description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
     maintainers = with maintainers; [ jpas jwiegley ];
@@ -25,6 +46,6 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: builtins.hasAttr v coqVersions;
   };
 }

From 5d19c3525ed9dd48e87c25beff1f8ec71d4a8de5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jan 2020 22:58:10 +0000
Subject: [PATCH 665/755] sbt: 1.3.5 -> 1.3.7

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index bd0c667fdad6..486f44d8c64d 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.3.5";
+  version = "1.3.7";
 
   src = fetchurl {
     urls = [
       "https://piccolo.link/sbt-${version}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
     ];
-    sha256 = "1c1ha4w3c36l7w2ncmwvry05hwcj8pv7dkpq23wdc25w1yj0l7sn";
+    sha256 = "054qfbvhkh1w66f2nvsv1mvrkjc9qddzsnfrhmaqx79gglxllgc1";
   };
 
   patchPhase = ''

From 7d604b8dd7eb3b51b28626562463474c7b9c47f1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 00:30:50 +0100
Subject: [PATCH 666/755] scalafmt: 2.2.2 -> 2.3.2

https://github.com/scalameta/scalafmt/releases/tag/v2.3.2
---
 pkgs/development/tools/scalafmt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 8de74efad1db..5c0fc6f28edf 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "scalafmt";
-  version = "2.2.2";
+  version = "2.3.2";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -13,7 +13,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "08qzcmps2biaf267nv945a924ca7rw8w7gzmjfv32r7aayz6pk1l";
+    outputHash     = "0q42qa6k4wqnfj710lcarkg8hv7wpvfhvjh9ygil1ah8936xmj72";
   };
 in
 stdenv.mkDerivation {

From 5c2c7d9dae36dc9a26048520d047fe76aa7e61d5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Jan 2020 20:04:41 -0500
Subject: [PATCH 667/755] Revert "aws-checksums: 0.1.3 -> 0.1.5"

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

diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix
index 99cefde8937f..124984f0d538 100644
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/pkgs/development/libraries/aws-checksums/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-checksums";
-  version = "0.1.5";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "018fnpn0jc686jxp5wf8qxmjphk3z43l8n1mgcgaa9zw94i24jgk";
+    sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp";
   };
 
   nativeBuildInputs = [ cmake ];

From 8604575f6bfa82cbec3ce6a1450d8808da2b6d31 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Sun, 26 Jan 2020 01:10:17 +0000
Subject: [PATCH 668/755] ocamlPackages.dum: init at 1.0.1 (#74817)

* ocamlPackages.dum: init at 1.0.1

* Cleanup
---
 .../development/ocaml-modules/dum/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/dum/default.nix

diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
new file mode 100644
index 000000000000..37c00f6b31e9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub, buildOcaml, ocaml
+, easy-format
+}:
+
+buildOcaml rec {
+  name = "dum";
+  version = "1.0.1";
+
+  minimumOCamlVersion = "4.06";
+
+  src = fetchFromGitHub {
+    owner = "mjambon";
+    repo = name;
+    rev = "v${version}";
+    sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
+  };
+
+  buildInputs = [ easy-format ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = https://github.com/mjambon/dum;
+    description = "Inspect the runtime representation of arbitrary OCaml values";
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.alexfmpe ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a6adfc958152..f90068e00eb4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -241,6 +241,8 @@ let
 
     duff = callPackage ../development/ocaml-modules/duff { };
 
+    dum = callPackage ../development/ocaml-modules/dum { };
+
     dune = callPackage ../development/tools/ocaml/dune { };
 
     dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };

From aa2241f8576ce755f9375e2a4b14424443af7ab2 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 15 Dec 2019 01:35:19 +0100
Subject: [PATCH 669/755] pentobi: init at 17.3

---
 pkgs/games/pentobi/default.nix  | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/games/pentobi/default.nix

diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
new file mode 100644
index 000000000000..2dc196c33cc3
--- /dev/null
+++ b/pkgs/games/pentobi/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool
+  , qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
+  , wrapQtAppsHook
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  version = "17.3";
+  pname = "pentobi";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz";
+    sha256 = "00c495i4vrji9hs7v8xr9gm8yqs97bfk2wzsayhps11hmbqzllx9";
+  };
+
+  nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ];
+  buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ];
+
+  patchPhase = ''
+    substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
+    substituteInPlace pentobi/unix/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
+    substituteInPlace pentobi/docbook/CMakeLists.txt --replace "/html" "/share/xml/docbook-xsl/html"
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_VERBOSE_MAKEFILE=1"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}"
+    "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
+  ];
+
+  meta = {
+    description = "A computer opponent for the board game Blokus";
+    homepage = https://pentobi.sourceforge.io;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc018e048a7f..eef90aa75b7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23248,6 +23248,8 @@ in
 
   pacvim = callPackage ../games/pacvim { };
 
+  pentobi = libsForQt5.callPackage ../games/pentobi { };
+
   performous = callPackage ../games/performous {
     boost = boost166;
   };

From 5eaeb08701d184bd9a22721ae5d718e004b40f3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 05:20:05 -0800
Subject: [PATCH 670/755] intel-gmmlib: 19.3.4 -> 19.4.1

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

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 6c872272e379..4637c8c950fe 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "19.3.4";
+  version = "19.4.1";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "1vgh14vdmwr34l6rfzmbpsdwp4xi7qp8lg527p16pm7nv0bwx2zk";
+    sha256 = "167g5rmrmzmfp4y4vghyxqi4schvvkwax3cvqgniqx8q1ib5l346";
   };
 
   nativeBuildInputs = [ cmake ];

From 2d172e640363d8bd1fe2483f05cce41b56cd66ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 02:39:07 +0000
Subject: [PATCH 671/755] brial: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 56a78b00cd64..4ffe147b27f2 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "1.2.7";
   pname = "brial";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
     rev = version;
-    sha256 = "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab";
+    sha256 = "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm";
   };
 
   # FIXME package boost-test and enable checks

From 37539e18a57138c2a98c3452259c386b1144740c Mon Sep 17 00:00:00 2001
From: petercommand <petercommand@gmail.com>
Date: Tue, 24 Dec 2019 17:18:07 +0800
Subject: [PATCH 672/755] xmousepasteblock: init at 1.0

---
 maintainers/maintainer-list.nix             |  6 ++++++
 pkgs/tools/X11/xmousepasteblock/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/X11/xmousepasteblock/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a79221ce2854..3ed31c9ce919 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5443,6 +5443,12 @@
     githubId = 3250809;
     name = "Milan Pässler";
   };
+  petercommand = {
+    email = "petercommand@gmail.com";
+    github = "petercommand";
+    githubId = 1260660;
+    name = "petercommand";
+  };
   peterhoeg = {
     email = "peter@hoeg.com";
     github = "peterhoeg";
diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix
new file mode 100644
index 000000000000..0cace7f452bb
--- /dev/null
+++ b/pkgs/tools/X11/xmousepasteblock/default.nix
@@ -0,0 +1,21 @@
+{ xorg, stdenv, libev, fetchFromGitHub, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "xmousepasteblock";
+  version = "1.0";
+  src = fetchFromGitHub {
+    owner = "milaq";
+    repo = "XMousePasteBlock";
+    sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns";
+    rev = version;
+  };
+  makeFlags = "PREFIX=$(out)";
+  buildInputs = with xorg; [ libX11 libXext libXi libev ];
+  nativeBuildInputs = [ pkgconfig ];
+  meta = with stdenv.lib; {
+    description = "Middle mouse button primary X selection/clipboard paste disabler";
+    homepage = https://github.com/milaq/XMousePasteBlock;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.petercommand ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eef90aa75b7a..17d35b3644c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2138,6 +2138,8 @@ in
     libmaxminddb = null;
   };
 
+  xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { };
+
   mar1d = callPackage ../games/mar1d { } ;
 
   mcrypt = callPackage ../tools/misc/mcrypt { };

From a927ceff4c3b540b7e3cb74c6ca887a8a59c188f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 03:51:22 +0000
Subject: [PATCH 673/755] dero: 0.11.6 -> 0.11.7

---
 pkgs/applications/blockchains/dero.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix
index 0ab63bb53951..8aa693d28714 100644
--- a/pkgs/applications/blockchains/dero.nix
+++ b/pkgs/applications/blockchains/dero.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dero";
-  version = "0.11.6";
+  version = "0.11.7";
 
   src = fetchFromGitHub {
     owner = "deroproject";
     repo = "dero";
     rev = "v${version}";
-    sha256 = "0jc5rh2ra4wra04dwv9sydid5ij5930s38mhzq3qkdjyza1ahmsr";
+    sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From b1c751119f9b404eb52b90acd174cba5c407efa7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 03:57:54 +0000
Subject: [PATCH 674/755] diff-pdf: 0.3 -> 0.4.1

---
 pkgs/applications/misc/diff-pdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index af47afcc601d..83116da4df05 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -9,13 +9,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "diff-pdf";
-  version = "0.3";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "diff-pdf";
     rev = "v${version}";
-    sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i";
+    sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl";
   };
 
   nativeBuildInputs = [ autoconf automake pkgconfig ];

From 8699530c0f946968bd5a880193dbcd5c2e7c248f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 04:31:29 +0000
Subject: [PATCH 675/755] elogind: 241.4 -> 243.4

---
 pkgs/applications/misc/elogind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix
index 3d71d9855d04..9565e7213dcd 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/pkgs/applications/misc/elogind/default.nix
@@ -29,13 +29,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "elogind";
-  version = "241.4";
+  version = "243.4";
 
   src = fetchFromGitHub {
     owner = "elogind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13nd0chackqclgvw43910k4pkw2q773dh6wq9s5f3d97ibnik48k";
+    sha256 = "141frvgyk4fafcxsix94qc0d9ffrwksld8lqq4hq6xsgjlvv0mrs";
   };
 
   nativeBuildInputs = [

From 4edc5f82369046acbdc93e438f75d3e664f926b0 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Fri, 17 Jan 2020 09:34:26 +0100
Subject: [PATCH 676/755] vimPlugins.vim-smt2: init at 2018-05-20

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bd829998b5b0..56fbe8273edd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5173,6 +5173,17 @@ let
     };
   };
 
+  vim-smt2 = buildVimPluginFrom2Nix {
+    pname = "vim-smt2";
+    version = "2018-05-20";
+    src = fetchFromGitHub {
+      owner = "bohlender";
+      repo = "vim-smt2";
+      rev = "9582e37b1dfd75621e51a3ac2275b6c6c895317f";
+      sha256 = "0cas6c3pj55qhbcy2vaygg8l9gncjshi1g0a54l78x73d3y3wm03";
+    };
+  };
+
   vim-sneak = buildVimPluginFrom2Nix {
     pname = "vim-sneak";
     version = "2020-01-05";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 37019541caa9..a069638cadf9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -27,6 +27,7 @@ bkad/camelcasemotion
 bling/vim-bufferline
 blueyed/vim-diminactive
 bogado/file-line
+bohlender/vim-smt2
 brennanfee/vim-gui-position
 bronson/vim-trailing-whitespace
 brooth/far.vim
@@ -196,8 +197,8 @@ KeitaNakamura/neodark.vim
 keith/swift.vim
 kien/rainbow_parentheses.vim
 konfekt/fastfold
-kristijanhusak/defx-icons
 kristijanhusak/defx-git
+kristijanhusak/defx-icons
 kristijanhusak/vim-hybrid-material
 kshenoy/vim-signature
 lambdalisue/vim-gista

From e5ca1ca263d1a49ffafcbaad60268f88665d0c43 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Fri, 17 Jan 2020 09:34:57 +0100
Subject: [PATCH 677/755] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 144 ++++++++++++++--------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 56fbe8273edd..eb5cf21e79d5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -314,12 +314,12 @@ let
 
   coc-eslint = buildVimPluginFrom2Nix {
     pname = "coc-eslint";
-    version = "2019-11-11";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-eslint";
-      rev = "ba55d386f296cc3ef3da4b14147dfb7c3ef18ecb";
-      sha256 = "1jxw4h3vwbv6and90bwrgcp4cvd7af547x270lc2085nkna3hdk9";
+      rev = "51ee1951213a1e809d3e279ba2ad2a5050602aa6";
+      sha256 = "1pggil5y6zk6jnfpmv2r7fiaar8lnzjqi3b7qknmi0w9rxcl7r0v";
     };
   };
 
@@ -424,12 +424,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-01-13";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "b2b3c6e43f8dc0a9353046faacb2cfafe0220228";
-      sha256 = "160y5rz1nhpdlb9j3ximn6ylj0rabkbvl0h7jil95rin60sq91d1";
+      rev = "8806b10655380bb3bac6143450e93da7f003223b";
+      sha256 = "0rzyha80vqpjisp6sf3whbcy53a69i8zk6c781ag1a699b38gbq9";
     };
   };
 
@@ -468,12 +468,12 @@ let
 
   coc-python = buildVimPluginFrom2Nix {
     pname = "coc-python";
-    version = "2019-11-26";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-python";
-      rev = "714ae8de45ab756d5b65f0be0b616153220b9257";
-      sha256 = "17gb0xbvczkqxzs2abknr460v0rcvgsi0m7pc4v0waggr690z53l";
+      rev = "3e03f98a1979b3ef1901c28cdd8d27a8d03bf399";
+      sha256 = "1va1z1w0hjb1h03n6shsyg2i54f6wdpdpq4gl79fl96jd94k8ihp";
     };
   };
 
@@ -523,12 +523,12 @@ let
 
   coc-solargraph = buildVimPluginFrom2Nix {
     pname = "coc-solargraph";
-    version = "2020-01-11";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-solargraph";
-      rev = "c767dd19c8d07920e10f126b4b71f187c7bdcb6a";
-      sha256 = "014k1sqjfzcr052vnqnr5ccxpw2yr0dfgd0657nwjgbhnpf8qn3s";
+      rev = "da48852eb9127091f993568dab10982eb201d764";
+      sha256 = "1mw5qfpslzvp9h1yz4zfjf75xixgjfq82c8m7zlfq743sd2gni44";
     };
   };
 
@@ -821,23 +821,23 @@ let
 
   defx-icons = buildVimPluginFrom2Nix {
     pname = "defx-icons";
-    version = "2019-11-03";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "defx-icons";
-      rev = "1412fd083eb54ffedb4f3ae32ddc7ce28613a144";
-      sha256 = "1x0xpixbmxm15g5nmsslccdngm14sg86ymy6mywg9xfbnrh1vn0p";
+      rev = "26363a6fd830cc02b84f330955c055845f0a8356";
+      sha256 = "02fga1rmg4if7pbk5awkwfqn4cl0mvpypxgq6wpvcwb3xp0axkbr";
     };
   };
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-01-08";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "2823cfbf37ae86bf20b56a4dacff123c54dc85fa";
-      sha256 = "0hbmdkwfhihjn1sxlznhv6fls8zgfvm7srigw8anxh7zr7rx2qz3";
+      rev = "e05b8406536f6cf79ddb5a57a9b4cbcf0f026b76";
+      sha256 = "0pvfnwkzgw9357r3mjsv4kx64w8sjjfvffb8nw4h4s50q3kkv42x";
     };
   };
 
@@ -876,12 +876,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-01-13";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "22dd7524bef3468af674fb1ecfb3e55ee679ebc0";
-      sha256 = "03cf90kvq337mj151y5m0w5px6h3y6hanfj2bcxwnpwifmjdinij";
+      rev = "5bd1b8a9a87106733b89dad3f49d8681f0e18084";
+      sha256 = "1aacvm6abgszmirwvqj1j21fifvwqzq9amqlcg1rc91i0qd7f19m";
     };
   };
 
@@ -1099,12 +1099,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2019-12-08";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "e20bff5f3ef4ea29b64f386fa1994281832863d0";
-      sha256 = "15xsin3wv7gba0wd7766ylgl9k32xzk0crv3liqmxsn5kgggkcxa";
+      rev = "3bb3bbaa4508b5c2a1d2653304a0e24e9e1ed186";
+      sha256 = "112qnnzhszfr9yflfqrj6wgjzz1w5j8m59qrzlqgi8wr7mzvwlb0";
     };
   };
 
@@ -1278,12 +1278,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-01-10";
+    version = "2020-01-14";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "8a6894d6a560497bd35947f55ece381bf4f2d9ed";
-      sha256 = "17f64c3z03g45iw68ir9wszq3bjlk661ccy87g0wxvl2pkcmnk53";
+      rev = "dc4c4c22715c060a2babd5a5187004bdecbcdea7";
+      sha256 = "0vd5jj0b0sdgawmadxkfl3s2d6m7nwgprhwnah4k7in8lcgq0jz1";
     };
   };
 
@@ -1388,12 +1388,12 @@ let
 
   gundo-vim = buildVimPluginFrom2Nix {
     pname = "gundo-vim";
-    version = "2017-05-09";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "gundo.vim";
-      rev = "46c443ee9d5854320eb965a1fdee781ba83a070e";
-      sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2";
+      rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7";
+      sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb";
     };
   };
 
@@ -1564,12 +1564,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2020-01-10";
+    version = "2020-01-14";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "c0ded0baf2971cec3698d7c799c04ad971a1484d";
-      sha256 = "0bbivgm62a9v28r968dsx174km72an9xxz98r1r4z5krllccilab";
+      rev = "e2abec21c5d9794d22d4b0c0327d274c87a99c9f";
+      sha256 = "18mbhabl9iixy11pg055akmdrdrfna9dlbi2xysshjzijrc7gdkw";
       fetchSubmodules = true;
     };
   };
@@ -1983,12 +1983,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2019-11-25";
+    version = "2020-01-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "7e300f1b986f46b217c26906ca4ee88629f18610";
-      sha256 = "121zqdmpz2dmgsc6zzvrbjhbc3ik5hbj069wh33laxvj74gsar6k";
+      rev = "c2d13761b75db006a72797402b9ef41630c7ddaa";
+      sha256 = "1xv41xcxic1mj7544pmvs8iafidr69cb6xg6gn8xc6byh4wv409v";
     };
   };
 
@@ -2071,12 +2071,12 @@ let
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2020-01-06";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "ee79ecfb67e4403e54ea59c175ca4d39544395e8";
-      sha256 = "0zny0ycxfkcfj65y8m70spj96lv81fv52s07r8ncfa4bqm9kk9sd";
+      rev = "26740d1157dc1befe2a088052e10cf00436a5003";
+      sha256 = "13q14clp94mmzfkixxd9rg16div5sngnxhqagvj06jw53cs23cdg";
     };
   };
 
@@ -2676,12 +2676,12 @@ let
 
   splice-vim = buildVimPluginFrom2Nix {
     pname = "splice-vim";
-    version = "2019-12-23";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "sjl";
       repo = "splice.vim";
-      rev = "fb0d7052e5569f59cb94f0e4303307affdd0e271";
-      sha256 = "1vxxlh88dxmrsfr8w87395h84hgflcgaj6s35vjg34464xzsdn8s";
+      rev = "815a28e687fdf78b67e9b9cd4c21277bbe658873";
+      sha256 = "0bh1gr2h6w872ql72rdlzpk5znl4lz01x6lgyf330sickizz5mvb";
     };
   };
 
@@ -2786,12 +2786,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2020-01-08";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
-      rev = "3bd3ba403dfaf5868656264f979fc0dc63526afb";
-      sha256 = "1s9y6qxvys393gsql4x5v0y2wfdb8b2a7mv8a39as98msq67a4sx";
+      rev = "db6f884fc77aaaf29772e209a54f5f346d2083e5";
+      sha256 = "0vywdbvrwbimdizjzdncmrsl21jbklqwxq4g2piw3kqmgk721jg0";
     };
   };
 
@@ -3777,12 +3777,12 @@ let
 
   vim-eunuch = buildVimPluginFrom2Nix {
     pname = "vim-eunuch";
-    version = "2019-11-13";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
-      rev = "75efe06ccc63b7cd50b193b99cce83e3ad3e60cb";
-      sha256 = "0yjsk6amlbgdbp95h8fp4x1hf9gmrfgrvz9gizyh08xdrb7pbpdw";
+      rev = "33e875b31c8b811a0a47908884a5e2339106bbe8";
+      sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3";
     };
   };
 
@@ -3920,12 +3920,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-01-11";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "6bc345f6f16aee0dcc361f2f3bf80e4964f461af";
-      sha256 = "0fbbi9gsmrjbff75y0r9zdjcbyc7lf5j9pyski3y5wma4z3l4idr";
+      rev = "c83355d5c52002f94d08267f1d14ca6d1a2763e9";
+      sha256 = "19afdby0byyr9flirfd7w3zzp66sab2bh03bh9y7jaglm1hpxfhm";
     };
   };
 
@@ -3964,12 +3964,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-01-06";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "0946c53cfc6edfb8dbf4b25a27d013c0b6ec6619";
-      sha256 = "06n4w9c8w2dyh8nwmlmz4d8hqy4yk9i6w01qa9plbvkhb1lrv21l";
+      rev = "9add23a492cba86df506db3be363c699f6c8d28e";
+      sha256 = "18s8a5634sldcz1fmn58lkgx8wlp4pq7gglal6qk84ckmsvlxcdx";
     };
   };
 
@@ -4592,12 +4592,12 @@ let
 
   vim-mucomplete = buildVimPluginFrom2Nix {
     pname = "vim-mucomplete";
-    version = "2019-12-07";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-mucomplete";
-      rev = "137b7e5c671b4b376b2df7492c4023ac6e1439da";
-      sha256 = "1pv19ylhifd32p8jb8rvbd8l5wik7349q4m4f8a8qycab2ba5xhv";
+      rev = "93138310df5faca67dae456a641cb84506765a10";
+      sha256 = "0ai0icgwcr7ygwfj3s1hfg7mrpfmaccapp3vcd674p5f81brhcdq";
     };
   };
 
@@ -4768,12 +4768,12 @@ let
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix {
     pname = "vim-pandoc-syntax";
-    version = "2019-11-14";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc-syntax";
-      rev = "98a3051566690fcd779f540e9d4a81ccad667bd5";
-      sha256 = "0bvrkflryzb43xg5s9kiksk7nslgrqpybasz4grjv6lnmzis7x97";
+      rev = "f7ea41a3bec8362ff0adf3336bc068cbcc636420";
+      sha256 = "04hmcqag21fmb3flabbhybp6s8ysf3rxr05kxqdlln4wamimag81";
     };
   };
 
@@ -5098,12 +5098,12 @@ let
 
   vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix {
     pname = "vim-sexp-mappings-for-regular-people";
-    version = "2019-11-13";
+    version = "2020-01-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sexp-mappings-for-regular-people";
-      rev = "f10bfacf2a20c719a3e0b6b5dfbfb2662f48b19e";
-      sha256 = "08z1a5f0k2aafk7ris2w3xf0s2jcsi94bd1wh8idr4fxljjs77qb";
+      rev = "7c3de2f13422fb4b62b4c34a660532c7b3d240c7";
+      sha256 = "0malswal9hnbq2wf1rx2lp1r69wpwsvyhgi46xbg079x2n857bmj";
     };
   };
 
@@ -5208,12 +5208,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-01-13";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "5279654b3e9fc280742d02c9509d4313d9da18e9";
-      sha256 = "0xnml4ayjwf7mzpz64alwygpgccvj4znask76ldw3hxp112fwcah";
+      rev = "867f5cc995aec6c6f065d0ad76f5f0c914df4493";
+      sha256 = "1gnxqqa93laf1yg94pvg5sb8hn59h1x33dyn68hwrld4yf8hriz1";
     };
   };
 
@@ -5802,12 +5802,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-01-12";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "aabfcf9e0c95bc08125aefaeb9fdfc9be04913c5";
-      sha256 = "0d7sv6f8iafwm891vl4wlsv93jfqjckmsrg2k9rfynk737vsmvp5";
+      rev = "5da264d236fa735fb6ab64d132f5cdf5a5612170";
+      sha256 = "1gdcz9zm99j9xm7qar38d979il2vmvgh0a4n0zm2rdp10n1p669k";
     };
   };
 
@@ -5846,12 +5846,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-01-12";
+    version = "2020-01-15";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "221893d85d2e8ed5ec51da12bf23d2e5bada57cf";
-      sha256 = "1ggwkmi6haj7hayiki3nd9vrc14l4z1912jd06w22hmyl86926x9";
+      rev = "323591f0a45c59b8e94c2b7b0995530cb1a153af";
+      sha256 = "1j1ijn1s9qirb55z2qyf0h48m00j6rsz45y1djkz55m63ckr576l";
     };
   };
 

From 1c1ed7af3987a57f4f2b995600fb7cd3c291f34b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 06:44:31 +0000
Subject: [PATCH 678/755] libasr: 1.0.2 -> 1.0.4

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

diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index 0c8f82138e7f..40158898f3d3 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libasr";
-  version=  "1.0.2";
+  version=  "1.0.4";
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
+    sha256 = "1d6s8njqhvayx2gp47409sp1fn8m608ws26hr1srfp6i23nnpyqr";
   };
 
   buildInputs = [ libevent openssl ];

From ce1788bd20aca393ea5bbbf652fba2bda9996cf8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 07:01:24 +0000
Subject: [PATCH 679/755] libow: 3.2p1 -> 3.2p3

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

diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
index fa0db0cd4ffc..b9eedc4cd95d 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/pkgs/development/libraries/libow/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
 
 stdenv.mkDerivation rec {
-  version = "3.2p1";
+  version = "3.2p3";
   pname = "libow";
 
   src = fetchFromGitHub {
     owner = "owfs";
     repo = "owfs";
     rev = "v${version}";
-    sha256 = "17jhhvlqzndf7q3xnb8bjf4j0j905c420cbxabwpz8xac3z62vb8";
+    sha256 = "02l3r4ixhicph5iqxdjanck2gbqkfs9vnnac112bzlvlw3x9r03m";
   };
 
   nativeBuildInputs = [ autoconf automake pkgconfig ];

From 26183d083373168f171169c7eeac2c0fc87bf142 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 07:34:20 +0000
Subject: [PATCH 680/755] litecoind: 0.16.3 -> 0.17.1

---
 pkgs/applications/blockchains/litecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix
index 33ac2be18322..403c559ee2f1 100644
--- a/pkgs/applications/blockchains/litecoin.nix
+++ b/pkgs/applications/blockchains/litecoin.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.3";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp";
+    sha256 = "08a0ghs4aa9m3qv3ppydyshfibykdwxk07i1vcqvg0ycqisdpb7y";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 4cf316f5bd952507e6a7159e4a7b245618aedb5e Mon Sep 17 00:00:00 2001
From: blanky0230 <blanky0230@gmail.com>
Date: Fri, 15 Nov 2019 16:28:37 +0100
Subject: [PATCH 681/755] tuxedo-keyboard: init at 2019-08-26.

---
 .../firmware/tuxedo-keyboard/default.nix      | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix

diff --git a/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix
new file mode 100644
index 000000000000..79586bbe1229
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, kernel, kmod }:
+
+# TODO: look at the other kernel modules packages and see if you find improvements to do
+
+stdenv.mkDerivation rec {
+  pname = "tuxedo-keyboard-${kernel.version}";
+  version = "2019-08-26";
+
+  src = fetchFromGitHub {
+    owner = "tuxedocomputers";
+    repo = "tuxedo-keyboard";
+    rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5";
+    sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17";
+  };
+  
+
+  unpackPhase = ''
+    mkdir -p $out/build/src
+    cp -r $src/* $out/build
+  '';
+
+  makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
+
+  installPhase = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}"
+    cp $out/build/src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion}
+    rm -rf $out/build
+  '';
+
+  meta = {
+    description = "Full color keyboard driver for tuxedo computers laptops";
+    homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.blanky0230 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7753238f29f..2faf957dc9a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16570,6 +16570,8 @@ in
 
     facetimehd = callPackage ../os-specific/linux/facetimehd { };
 
+    tuxedo-keyboard = callPackage ../os-specific/linux/firmware/tuxedo-keyboard { };
+
     jool = callPackage ../os-specific/linux/jool { };
 
     mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };

From f2fea8894dae30ae1cc46c70302a9cc7d54a6ea4 Mon Sep 17 00:00:00 2001
From: blanky0230 <blanky0230@gmail.com>
Date: Thu, 21 Nov 2019 23:10:41 +0100
Subject: [PATCH 682/755] nixos/tuxedo-keyboard: init module.

---
 maintainers/maintainer-list.nix               |  1 +
 nixos/modules/hardware/tuxedo-keyboard.nix    | 35 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 .../tuxedo-keyboard/default.nix               | 18 +++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 nixos/modules/hardware/tuxedo-keyboard.nix
 rename pkgs/os-specific/linux/{firmware => }/tuxedo-keyboard/default.nix (63%)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7e8042292ee4..2798a6c0f8ed 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -960,6 +960,7 @@
   blanky0230 = {
     email = "blanky0230@gmail.com";
     github = "blanky0230";
+    githubId = 5700358;
     name = "Thomas Blank";
   };
   blitz = {
diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixos/modules/hardware/tuxedo-keyboard.nix
new file mode 100644
index 000000000000..898eed244935
--- /dev/null
+++ b/nixos/modules/hardware/tuxedo-keyboard.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let 
+  cfg = config.hardware.tuxedo-keyboard;
+  tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard;
+in
+  {
+    options.hardware.tuxedo-keyboard = {
+      enable = mkEnableOption ''
+          Enables the tuxedo-keyboard driver.
+
+          To configure the driver, pass the options to the <option>boot.kernelParams</option> configuration.
+          There are several parameters you can change. It's best to check at the source code description which options are supported.
+          You can find all the supported parameters at: <link xlink:href="https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam" />
+
+          In order to use the <literal>custom</literal> lighting with the maximumg brightness and a color of <literal>0xff0a0a</literal> one would put pass <option>boot.kernelParams</option> like this:
+
+          <programlisting>
+          boot.kernelParams = [
+           "tuxedo_keyboard.mode=0"
+           "tuxedo_keyboard.brightness=255"
+           "tuxedo_keyboard.color_left=0xff0a0a"
+          ];
+          </programlisting>
+      '';
+    };
+
+    config = mkIf cfg.enable 
+    {
+      boot.kernelModules = ["tuxedo_keyboard"];
+      boot.extraModulePackages = [ tuxedo-keyboard ];
+    };
+  }
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index eadf1d2d89b3..8953ec03948b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./hardware/printers.nix
   ./hardware/raid/hpsa.nix
   ./hardware/steam-hardware.nix
+  ./hardware/tuxedo-keyboard.nix
   ./hardware/usb-wwan.nix
   ./hardware/onlykey.nix
   ./hardware/video/amdgpu.nix
diff --git a/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
similarity index 63%
rename from pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix
rename to pkgs/os-specific/linux/tuxedo-keyboard/default.nix
index 79586bbe1229..b67bf2d3dab6 100644
--- a/pkgs/os-specific/linux/firmware/tuxedo-keyboard/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchFromGitHub, kernel, kmod }:
 
-# TODO: look at the other kernel modules packages and see if you find improvements to do
-
 stdenv.mkDerivation rec {
   pname = "tuxedo-keyboard-${kernel.version}";
   version = "2019-08-26";
@@ -12,25 +10,19 @@ stdenv.mkDerivation rec {
     rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5";
     sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17";
   };
-  
-
-  unpackPhase = ''
-    mkdir -p $out/build/src
-    cp -r $src/* $out/build
-  '';
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
 
   installPhase = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}"
-    cp $out/build/src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion}
-    rm -rf $out/build
+    mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Full color keyboard driver for tuxedo computers laptops";
     homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.blanky0230 ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.blanky0230 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2faf957dc9a7..397612f7a538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16570,7 +16570,7 @@ in
 
     facetimehd = callPackage ../os-specific/linux/facetimehd { };
 
-    tuxedo-keyboard = callPackage ../os-specific/linux/firmware/tuxedo-keyboard { };
+    tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { };
 
     jool = callPackage ../os-specific/linux/jool { };
 

From e39afd4095a08df4193893b87e0e2fe7d333e864 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 26 Jan 2020 04:20:00 -0500
Subject: [PATCH 683/755] procs: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 46eec85b1bf7..b1faa129f34b 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch
-, Security
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.9.0";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lprxfy733rs39fg8yif3p8vz9szk7d529ahn1kn70zm8i3mqpch";
+    sha256 = "09n22vyqhqkk9qq91q44l8fi0ks0xyyhsxfsp9pdlnpng9s7hcdg";
   };
 
-  cargoSha256 = "11l2dggvkk2vx4xap2q02qrr576i4mswf67plhg23azr43fpi0r5";
+  cargoSha256 = "135h7aikwy26p30g4734w08bfab73n49bhljssw516wd62xbdk64";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 39d02cbeb7a107b26a349bdb8d5053b0ba8a2e06 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 26 Jan 2020 05:00:00 -0500
Subject: [PATCH 684/755] pgformatter: 4.1 -> 4.2

Changelog: https://github.com/darold/pgFormatter/releases/tag/v4.2
---
 pkgs/development/tools/pgformatter/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
index dfdd453cb4e8..87bf826f5c58 100644
--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -2,13 +2,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "pgformatter";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
     rev = "v${version}";
-    sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
+    sha256 = "1fqhbs7q3nxda7acbcx8dyjh99d0mv485dpmiczxia7cy1xqi63g";
   };
 
   outputs = [ "out" ];
@@ -34,6 +34,7 @@ perlPackages.buildPerlPackage rec {
   meta = with stdenv.lib; {
     description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
     homepage = "https://github.com/darold/pgFormatter";
+    changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
     maintainers = [ maintainers.marsam ];
     license = [ licenses.postgresql licenses.artistic2 ];
   };

From 7cbcfa08a52674d718c5218aeec4e395d23b543c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 10:12:05 +0000
Subject: [PATCH 685/755] psc-package: 0.5.1 -> 0.6.0

---
 pkgs/development/compilers/purescript/psc-package/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 68b676d5a3ef..c2f8765a131c 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 mkDerivation rec {
   pname = "psc-package";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "purescript";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zadbph1vha3b5hvmjvs138dcwbab49f3v63air1l6r4cvpb6831";
+    sha256 = "165yax131rj1mdlqd28g6wcy1ps3k4w50z8gj9yc3nfs09dy0lab";
   };
 
   isLibrary = false;

From daf94bb3b0d78e4a189fff49632dc0efb17e3c32 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 11:54:02 +0000
Subject: [PATCH 686/755] strawberry: 0.6.7 -> 0.6.8

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

diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 07e7bb84c565..ad5685f71b02 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
 
 mkDerivation rec {
   pname = "strawberry";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    sha256 = "14bw4hmysrbl4havz03s3wl8bv76380wddf5zzrjvfjjpwn333r6";
+    sha256 = "0jc1m1855dg3f1i1p744c5s42ssmjs61znw4cf28ifamw1nbr1r5";
   };
 
   buildInputs = [

From 2775cf9e49a876535c5cf70e5e49e47708221bd3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 12:41:44 +0000
Subject: [PATCH 687/755] tiled: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index e66530aaf769..aa6fc0a7d240 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "tiled";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vhg8m1b7ccccrzlp0pyf3qskgvlf6sn1w956zsczmndrixbli9a";
+    sha256 = "1jfr9ngsbkn9j3yvy3mnx0llfwmk39dj8kfiy9fawkhw0v4bzjbd";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From 58c74d1a93fedff3983b52cf826b8d78d0a7313f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 12:47:37 +0000
Subject: [PATCH 688/755] tinygo: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
index 015c955000c2..1c7363a83bb9 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -3,13 +3,13 @@
 
 buildGoModule rec {
   pname = "tinygo";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
     rev = "v${version}";
-    sha256 = "03di8500dqk25giiajglcdf2gbc0jidsn8qsw2sxmkmnd1np7gyd";
+    sha256 = "0cmg8x9hpvzlxp6hiy9hkh9nn7ig7b0x6k8a2c3bw19pfx9lxksf";
   };
 
   modSha256 = "0r3lfi1bj550sf3b7ysz62c2c33f8zfli8208xixj3jadycb6r3z";

From 61c9405d4c0c6d0135267f024604ba19b2e453a6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 26 Jan 2020 14:23:32 +0100
Subject: [PATCH 689/755] direnv: 2.21.0 -> 2.21.1

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 77eca6af33c8..e05d11c9c727 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   pname = "direnv";
-  version = "2.21.0";
+  version = "2.21.1";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "0k0sh8pzpxix8sjhnvj2h3s6br32daj3mgac0i2bbzvmil77l2sb";
+    sha256 = "05yhhd6f55ps96faw9gz4ap8qmv41cfrsz8l0qbvir0jn2hjhmqw";
   };
 
   postConfigure = ''

From 61a6a60bf245e6b53e541c3392040cd88ad62924 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 13:27:17 +0000
Subject: [PATCH 690/755] vips: 8.8.4 -> 8.9.0

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

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index e551fc382fbf..486ab65970ba 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vips";
-  version = "8.8.4";
+  version = "8.9.0";
 
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "libvips";
     rev = "v${version}";
-    sha256 = "1gw8srjf5r6dhg6g5hh91if302mcr44dzy87mv230ar7027kwwbi";
+    sha256 = "0x61vnfnqv53pnp52nx610470x7pzdjbkqzk8wlc8i6cc2cg7f91";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''

From 0db4d2f1189c68a2292ce600eddb30bfbe280a9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 14:06:25 +0000
Subject: [PATCH 691/755] yder: 1.4.8 -> 1.4.9

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

diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix
index 7025fd2eb1cc..10d055eb4d76 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/pkgs/development/libraries/yder/default.nix
@@ -4,13 +4,13 @@
 assert withSystemd -> systemd != null;
 stdenv.mkDerivation rec {
   pname = "yder";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r3rhcsp182cg0vmx8wwibb415mg2qkx8zrfpb0b97nz30h9hbvd";
+    sha256 = "06kxkq8ydgbb6b827hkvmaqd0irpal0n4hm96r3inq1bigz9gnvx";
   };
 
   patches = [

From 2b11759d89c8ace4f27b850fe01af565b0188e56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 14:12:28 +0000
Subject: [PATCH 692/755] z-lua: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index 9c637d3ae806..171c86e805b5 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
     rev = "v${version}";
-    sha256 = "13cfdghkprkaxgrbwsjndbza2mjxm2x774lnq7q4gfyc48mzwi70";
+    sha256 = "0cn38sadcn65pgw6dgr59bnx9hf97011hydmpmfi3kzdqjmarwci";
   };
 
   dontBuild = true;

From 8250469517faf70ee05e6fda8a242095835398a9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Jan 2020 10:18:15 -0500
Subject: [PATCH 693/755] linux: 5.4.14 -> 5.4.15

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index ae14bc676fd0..77b28e5f34da 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.14";
+  version = "5.4.15";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk";
+    sha256 = "1ccldlwj89qd22cl06706w7xzm8n69m6kg8ic0s5ns0ghlpj41v4";
   };
 } // (args.argsOverride or {}))

From b25a192755a4429fc65fefb38f4ebd213971b361 Mon Sep 17 00:00:00 2001
From: Jarrod Pas <jarrod@jarrodpas.com>
Date: Sun, 26 Jan 2020 09:37:22 -0600
Subject: [PATCH 694/755] coqPackages.CoLoR support for Coq 8.10

---
 pkgs/development/coq-modules/CoLoR/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index c4a02162fa78..d145586af43b 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -6,6 +6,7 @@ let
     "8.7" = "1.4.0";
     "8.8" = "1.6.0";
     "8.9" = "1.6.0";
+    "8.10" = "1.7.0";
   };
   params = {
     "1.4.0" = {
@@ -18,6 +19,11 @@ let
       rev = "328aa06270584b578edc0d2925e773cced4f14c8";
       sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
     };
+    "1.7.0" = {
+      version = "1.7.0";
+      rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
+      sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
+    };
   };
   param = params.${coqVersions.${coq.coq-version}};
 in

From 0c59818ce74c111d6b940c875d4840e785bd17ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 15:58:22 +0000
Subject: [PATCH 695/755] bind: 9.14.9 -> 9.14.10

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 5e4a07bdf25e..9cfd7514621e 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.14.9";
+  version = "9.14.10";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9";
+    sha256 = "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From a63f916b879eb4fd1fbbb5b361afd86e726ab797 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Sat, 25 Jan 2020 15:54:03 +0100
Subject: [PATCH 696/755] nixos/prometheus-postfix-exporter: fix typo

---
 .../services/monitoring/prometheus/exporters/postfix.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
index f40819e826b0..d50564717eaf 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
@@ -74,7 +74,7 @@ in
                                           then "--systemd.slice ${cfg.systemd.slice}"
                                           else "--systemd.unit ${cfg.systemd.unit}")
           ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null))
-                       "--systemd.jounal_path ${cfg.systemd.journalPath}"
+                       "--systemd.journal_path ${cfg.systemd.journalPath}"
           ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")}
       '';
     };

From f63ef280df8f2ab32ba92e9f5a8af74320ced88b Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Sun, 26 Jan 2020 13:04:11 +0100
Subject: [PATCH 697/755] nixosTests: Drop invalid utf characters in command
 output

---
 nixos/lib/test-driver/test-driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index cf204a2619f5..75f80df53f21 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -395,7 +395,7 @@ class Machine:
         status_code_pattern = re.compile(r"(.*)\|\!EOF\s+(\d+)")
 
         while True:
-            chunk = self.shell.recv(4096).decode()
+            chunk = self.shell.recv(4096).decode(errors="ignore")
             match = status_code_pattern.match(chunk)
             if match:
                 output += match[1]

From 4df1df986d4a4bb3a72555ba59e1828ce19b594b Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Sun, 26 Jan 2020 12:32:47 +0100
Subject: [PATCH 698/755] nixosTests.limesurvey: Port to python

---
 nixos/tests/limesurvey.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/limesurvey.nix b/nixos/tests/limesurvey.nix
index ad66ada106b7..7228fcb83315 100644
--- a/nixos/tests/limesurvey.nix
+++ b/nixos/tests/limesurvey.nix
@@ -1,21 +1,26 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
   name = "limesurvey";
   meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
 
-  machine =
-    { ... }:
-    { services.limesurvey.enable = true;
-      services.limesurvey.virtualHost.hostName = "example.local";
-      services.limesurvey.virtualHost.adminAddr = "root@example.local";
-
-      # limesurvey won't work without a dot in the hostname
-      networking.hosts."127.0.0.1" = [ "example.local" ];
+  machine = { ... }: {
+    services.limesurvey = {
+      enable = true;
+      virtualHost = {
+        hostName = "example.local";
+        adminAddr = "root@example.local";
+      };
     };
 
-  testScript = ''
-    startAll;
+    # limesurvey won't work without a dot in the hostname
+    networking.hosts."127.0.0.1" = [ "example.local" ];
+  };
 
-    $machine->waitForUnit('phpfpm-limesurvey.service');
-    $machine->succeed('curl http://example.local/') =~ /The following surveys are available/ or die;
+  testScript = ''
+    start_all()
+
+    machine.wait_for_unit("phpfpm-limesurvey.service")
+    assert "The following surveys are available" in machine.succeed(
+        "curl http://example.local/"
+    )
   '';
 })

From ee2acd6c6c6d8c8a43fa2a5c125e777c9b5576f3 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Sun, 26 Jan 2020 13:04:36 +0100
Subject: [PATCH 699/755] nixosTests.proxy: Port to python

---
 nixos/tests/proxy.nix | 141 ++++++++++++++++++++----------------------
 1 file changed, 67 insertions(+), 74 deletions(-)

diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 3859d429c21b..6a14a9af59ae 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -1,97 +1,90 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
 
 let
-
-  backend =
-    { pkgs, ... }:
-
-    { services.httpd.enable = true;
-      services.httpd.adminAddr = "foo@example.org";
-      services.httpd.virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
-      networking.firewall.allowedTCPPorts = [ 80 ];
+  backend = { pkgs, ... }: {
+    services.httpd = {
+      enable = true;
+      adminAddr = "foo@example.org";
+      virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
     };
-
-in
-
-{
+    networking.firewall.allowedTCPPorts = [ 80 ];
+  };
+in {
   name = "proxy";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eelco ];
   };
 
-  nodes =
-    { proxy =
-        { nodes, ... }:
+  nodes = {
+    proxy = { nodes, ... }: {
+      services.httpd = {
+        enable = true;
+        adminAddr = "bar@example.org";
+        extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
+        extraConfig = ''
+          ExtendedStatus on
+        '';
+        virtualHosts.localhost = {
+          extraConfig = ''
+            <Location /server-status>
+              Require all granted
+              SetHandler server-status
+            </Location>
 
-        { services.httpd.enable = true;
-          services.httpd.adminAddr = "bar@example.org";
-          services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
-          services.httpd.extraConfig = ''
-            ExtendedStatus on
+            <Proxy balancer://cluster>
+              Require all granted
+              BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
+              BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
+            </Proxy>
+
+            ProxyStatus       full
+            ProxyPass         /server-status !
+            ProxyPass         /       balancer://cluster/
+            ProxyPassReverse  /       balancer://cluster/
+
+            # For testing; don't want to wait forever for dead backend servers.
+            ProxyTimeout      5
           '';
-          services.httpd.virtualHosts.localhost = {
-            extraConfig = ''
-              <Location /server-status>
-                Require all granted
-                SetHandler server-status
-              </Location>
-
-              <Proxy balancer://cluster>
-                Require all granted
-                BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
-                BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
-              </Proxy>
-
-              ProxyStatus       full
-              ProxyPass         /server-status !
-              ProxyPass         /       balancer://cluster/
-              ProxyPassReverse  /       balancer://cluster/
-
-              # For testing; don't want to wait forever for dead backend servers.
-              ProxyTimeout      5
-            '';
-          };
-
-          networking.firewall.allowedTCPPorts = [ 80 ];
         };
-
-      backend1 = backend;
-      backend2 = backend;
-
-      client = { ... }: { };
+      };
+      networking.firewall.allowedTCPPorts = [ 80 ];
     };
 
-  testScript =
-    ''
-      startAll;
+    backend1 = backend;
+    backend2 = backend;
 
-      $proxy->waitForUnit("httpd");
-      $backend1->waitForUnit("httpd");
-      $backend2->waitForUnit("httpd");
-      $client->waitForUnit("network.target");
+    client = { ... }: { };
+  };
 
-      # With the back-ends up, the proxy should work.
-      $client->succeed("curl --fail http://proxy/");
+  testScript = ''
+    start_all()
 
-      $client->succeed("curl --fail http://proxy/server-status");
+    proxy.wait_for_unit("httpd")
+    backend1.wait_for_unit("httpd")
+    backend2.wait_for_unit("httpd")
+    client.wait_for_unit("network.target")
 
-      # Block the first back-end.
-      $backend1->block;
+    # With the back-ends up, the proxy should work.
+    client.succeed("curl --fail http://proxy/")
 
-      # The proxy should still work.
-      $client->succeed("curl --fail http://proxy/");
+    client.succeed("curl --fail http://proxy/server-status")
 
-      $client->succeed("curl --fail http://proxy/");
+    # Block the first back-end.
+    backend1.block()
 
-      # Block the second back-end.
-      $backend2->block;
+    # The proxy should still work.
+    client.succeed("curl --fail http://proxy/")
+    client.succeed("curl --fail http://proxy/")
 
-      # Now the proxy should fail as well.
-      $client->fail("curl --fail http://proxy/");
+    # Block the second back-end.
+    backend2.block()
 
-      # But if the second back-end comes back, the proxy should start
-      # working again.
-      $backend2->unblock;
-      $client->succeed("curl --fail http://proxy/");
-    '';
+    # Now the proxy should fail as well.
+    client.fail("curl --fail http://proxy/")
+
+    # But if the second back-end comes back, the proxy should start
+    # working again.
+    backend2.unblock()
+    client.succeed("curl --fail http://proxy/")
+  '';
 })

From f13c6f7ce429e4a27deef9b90e56c28408b95ff9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 16:57:41 +0000
Subject: [PATCH 700/755] armadillo: 9.800.3 -> 9.800.4

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

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 8dec98271413..9f0f16d5cee2 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "9.800.3";
+  version = "9.800.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "16bm1pa5a8wsk497y9s18dyi3hax03z6g2x2z19b6z0bi3ff30d4";
+    sha256 = "1vcgqshlah5cv1954r1jv02y2iyr0gi5jqc8zz8wmvgm56vm83mw";
   };
 
   nativeBuildInputs = [ cmake ];

From 0fee572f237f38cf93c8fa7fb961efe18bc2bddc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 07:06:03 +0000
Subject: [PATCH 701/755] libqalculate: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index d369eebd88fd..dd6e3cbe9526 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "0qfdgxb46c18cp43z67n986xhj6x0sa95hryq42spf1p5ymbylqy";
+    sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18";
   };
 
   outputs = [ "out" "dev" "doc" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   patchPhase = ''
-    substituteInPlace libqalculate/Calculator.cc \
+    substituteInPlace libqalculate/Calculator-plot.cc \
       --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
       --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
   '' + stdenv.lib.optionalString stdenv.cc.isClang ''

From 8161fe21e0b505bd323a431be0bfc2386958d744 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 26 Jan 2020 18:43:29 +0100
Subject: [PATCH 702/755] qalculate-gtk: 3.6.0 -> 3.7.0

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 0a300a15d014..8370685f00a1 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "1b20sjkv853lqii0dpqg10rgcka3cs57zriihyd463n7dq3hsim5";
+    sha256 = "1zzvxkpman75lxhhvyggwzvrlc6v0rd5ak76rmcny51i4xirmrc0";
   };
 
   patchPhase = ''

From 7ece448aa91e4a7500c9437280c7ea1256e7f761 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Jan 2020 17:20:15 -0600
Subject: [PATCH 703/755] xorg.xorgserver: 1.20.6 -> 1.20.7 (PR #77706)

https://lists.x.org/archives/xorg-announce/2020-January/003036.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f83d76a3c2b4..42ad65f704ac 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
-    name = "xorg-server-1.20.6";
+    name = "xorg-server-1.20.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2;
-      sha256 = "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3";
+      url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2;
+      sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 2fcf09cd9fba..0f5377cb84a9 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2

From 02c75132d9f47dc4d2e8242b9dc838c34a098b22 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 19:21:45 +0100
Subject: [PATCH 704/755] python3Packages.pytesseract: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index b6d45980e537..1b185070bf72 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1j7d4aa6v1nd3pd1vrfmkv8mbmw0x78cjfpkq3nxpy1r4hj5nwq3";
+    sha256 = "1b6hmz9dqfn8il1g5vyz6izsxqjrbvrr2gs8gwwadyz8fx4vghx8";
   };
 
   patches = [

From a64770e6dd5c7c51aed5c01d76d1e19cef512d8e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 19:30:29 +0100
Subject: [PATCH 705/755] cargo-xbuild: 0.5.19 -> 0.5.21

---
 pkgs/development/tools/rust/cargo-xbuild/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index a5220775b52d..56cb5560f946 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.19";
+  version = "0.5.21";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j15d52bpl3k6jw0hzcxdvjayd2azdp5b9s2fq3ywd4zbda8rqp7";
+    sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7";
   };
 
   cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";

From 5e9d926fa3fe6f0e31f91799c597f5ed670c6e22 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 19:32:23 +0100
Subject: [PATCH 706/755] termtosvg: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 7dc2bc618ea6..93b52ad175e9 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "termtosvg";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1d0lmvprraspdqpn0rsqzvkkmpj8zk0crid5l39kxpjpxrv2irfg";
+    sha256 = "1vk5kn8w3zf2ymi76l8cpwmvvavkmh3b9lb18xw3x1vzbmhz2f7d";
   };
 
   propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ];

From e6a9c15fa1d86045549a6e385e2621945419850c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 19:49:57 +0100
Subject: [PATCH 707/755] python3Packages.python-ly: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix
index 4c1bd05f4a0f..5ac6e569c805 100644
--- a/pkgs/development/python-modules/python-ly/default.nix
+++ b/pkgs/development/python-modules/python-ly/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-ly";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl";
+    sha256 = "0s5hvsf17f4w1xszrf4pg29wfv9znkj195klq1v2qhlpxfp6772d";
   };
 
   # tests not shipped on `pypi` and

From 3d085a399c436a41d875801619e8f976b8519196 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 19:52:14 +0100
Subject: [PATCH 708/755] python3Packages.python-ly: remove myself from
 maintainer list

While going through my repology feed of package-updates I realized that
I'm still a maintainer of this. Just did an update in e6a9c15fa1d86045549a6e385e2621945419850c
and the package is pretty easy to maintain, but decided to make it clear
that I don't actively maintain this.
---
 pkgs/development/python-modules/python-ly/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix
index 5ac6e569c805..f8b7f023717c 100644
--- a/pkgs/development/python-modules/python-ly/default.nix
+++ b/pkgs/development/python-modules/python-ly/default.nix
@@ -16,6 +16,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Tool and library for manipulating LilyPond files";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 }

From f71cc3eb7ae6095ce2bf0b670f2a1be8142db389 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 20:11:58 +0100
Subject: [PATCH 709/755] cargo-tree: 0.27.0 -> 0.28.0

---
 pkgs/tools/package-management/cargo-tree/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index add08c50fccf..37d546adb9df 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,16 +1,16 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tree";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "sfackler";
     repo = "cargo-tree";
-    rev = "37030742fbf83106707525913ab6c4c3c701cd0e";
-    sha256 = "1mi52n02j9dmi19af6js0vmmqnl8rf4zxind3cxh401530cd8ml4";
+    rev = "v${version}";
+    sha256 = "0wv5zgyx18fypdb4pmgzxvr2gb9w8vgv6aqir3dxhcvcgf2j5c3n";
   };
 
-  cargoSha256 = "12p9dqlxa1b1sx8572w7hj0rlkkpv3k440pffdyjgyx4s1r9m0s0";
+  cargoSha256 = "16r7zzkf87v67spahaprc25agwh6d3i0kg73vx8a6w7hgqlk0zwa";
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

From b41b0b26dde61c17edb8556cbb301a7911d190b5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 20:23:19 +0100
Subject: [PATCH 710/755] cargo-flamegraph: 0.1.13 -> 0.2.0

---
 pkgs/development/tools/cargo-flamegraph/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix
index 26b737f13a7b..9d25d7cf3542 100644
--- a/pkgs/development/tools/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/cargo-flamegraph/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-flamegraph";
-  version = "0.1.13";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
-    owner = "ferrous-systems";
+    owner = "flamegraph-rs";
     repo = "flamegraph";
-    rev = version;
-    sha256 = "1s0jnj78fqz5hlgq656rr2s9ykmia51b89iffadiw6c2aw4fhv1a";
+    rev = "v${version}";
+    sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1";
   };
 
-  cargoSha256 = "0kmw2n4j5bisac0bv3npbwfz2z00ncd6w8ichwaz5hac5mi1a72f";
+  cargoSha256 = "1kmxpzgv24hf66gzyapxy48gzwqi0p0jvzv829sfdlp00qgj1kp4";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [

From cabda88653b5a40beb244f7af37055a186e83b65 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 26 Jan 2020 08:00:00 -0500
Subject: [PATCH 711/755] tfsec: 0.13.0 -> 0.19.0

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

diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 953e9f5b95af..49009570e57b 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "tfsec";
-  version = "0.13.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1nv7wdchbgf3y265kghhy8rbyvbs03ys5gv9622v0f2kswscy9xl";
+    sha256 = "1ddyvkv0949p0b6m1rwai5r87mca5xwyjwsjq7gbyqz9h10bv7nf";
   };
 
   goPackagePath = "github.com/liamg/tfsec";

From 8f8797d1845e61de4d084d7faac121c9f09ca5b9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 26 Jan 2020 04:20:00 -0500
Subject: [PATCH 712/755] buildpack: 0.6.0 -> 0.7.0

Changelog: https://github.com/buildpacks/pack/releases/tag/v0.7.0
---
 pkgs/development/tools/buildpack/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index 23afc8b53f29..c3eace891743 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "pack";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00v4kb9cv6nn7vrybjkv0kgcvfm5dsg0168dv253mrp9xmv8kd9l";
+    sha256 = "0glfxrw3x35m4nmhr9xwlc14y5g9zni85rcrcn3dvkvgh4m6ipaj";
   };
 
   goPackagePath = "github.com/buildpacks/pack";
@@ -19,6 +19,7 @@ buildGoPackage rec {
 
   meta = with lib; {
     homepage = "https://buildpacks.io/";
+    changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}";
     description = "Local CLI for building apps using Cloud Native Buildpacks";
     license = licenses.asl20;
     maintainers = [ maintainers.marsam ];

From 8a642afd0c2fde2f48dd561034ba126da144d6ed Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 25 Jan 2020 19:16:10 +0100
Subject: [PATCH 713/755] tautulli: 2.1.39 -> 2.1.42

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

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 36b561cca627..b6e5fa7deee4 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.39";
+  version = "2.1.42";
   pname = "Tautulli";
 
   pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lr0pf01fxay4wppzgwp9kz2vlnnb9f8lvgfic0zgwwil2ky6b1w";
+    sha256 = "0qrxxsrmqkc7v3irxi2226zvl16zid6q2wxvznci7dbg8f4rm7nw";
   };
 
   buildPhase = ":";

From 499af6321fdebed6826fb72942196490a74fa6b0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Jan 2020 22:32:13 +0100
Subject: [PATCH 714/755] mpv: 0.31.0 -> 0.32.0

https://github.com/mpv-player/mpv/releases/tag/v0.32.0
---
 pkgs/applications/video/mpv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 0ea042c13140..6a8c3df0f35b 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -105,13 +105,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "mpv";
-  version = "0.31.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner  = "mpv-player";
     repo   = "mpv";
     rev    = "v${version}";
-    sha256 = "138m09l4wi6ifbi15z76j578plmxkclhlzfryasfcdp8hswhs59r";
+    sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596";
   };
 
   postPatch = ''

From 39224a7f4eb1a79cc8184101959570aa1256c811 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 21:37:14 +0000
Subject: [PATCH 715/755] ejabberd: 19.09.1 -> 20.01

---
 pkgs/servers/xmpp/ejabberd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 821515caa09a..0ac216b8e525 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -24,12 +24,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "19.09.1";
+  version = "20.01";
   pname = "ejabberd";
 
   src = fetchurl {
     url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
-    sha256 = "1lj0zahsdg6naq007h8wp5p8ksdfwam3as7wiagvbj9gy8dgdp8q";
+    sha256 = "14bgwa6y17bhnwhcqb2hdl7psds0iqkcawb4kpaw6d7lzzsx4ay6";
   };
 
   nativeBuildInputs = [ fakegit ];

From 52ac64f74187a0e37f2c96b056d04c45470660ca Mon Sep 17 00:00:00 2001
From: leo60228 <iakornfeld@gmail.com>
Date: Sun, 26 Jan 2020 16:34:15 -0500
Subject: [PATCH 716/755] libirecovery: 2019-01-28 -> 2020-01-14

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

diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix
index be05f120e13a..bf48e88a4ec7 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/pkgs/development/libraries/libirecovery/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libirecovery";
-  version = "2019-01-28";
+  version = "2020-01-14";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = "5da2a0d7d60f79d93c283964888c6fbbc17be1a3";
-    sha256 = "0fqmr1h4b3qn608dn606y7aqv3bsm949gx72b5d6433xlw9b23n8";
+    rev = "10a1f8dd11a11a0b8980fbf26f11e3ce74e7a923";
+    sha256 = "1v5c9dbbkrsplj1zkcczzm0i31ar3wcx6fpxb0pi4dsgj8846aic";
   };
 
   outputs = [ "out" "dev" ];

From f97a152d44e65903d82f59dbcdd92699bf32e46b Mon Sep 17 00:00:00 2001
From: leo60228 <iakornfeld@gmail.com>
Date: Sun, 26 Jan 2020 16:34:43 -0500
Subject: [PATCH 717/755] idevicerestore: 2019-02-14 -> 2019-12-26

---
 pkgs/tools/misc/idevicerestore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix
index a12fa04c5fce..ec9d1f528533 100644
--- a/pkgs/tools/misc/idevicerestore/default.nix
+++ b/pkgs/tools/misc/idevicerestore/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "idevicerestore";
-  version = "2019-02-14";
+  version = "2019-12-26";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = "8a882038b2b1e022fbd19eaf8bea51006a373c06";
-    sha256 = "17lisl7ll43ixl1zqwchn7jljrdyl2p9q99w30i6qaci71mas37m";
+    rev = "8207daaa2ac3cb3a5107aae6aefee8ecbe39b6d4";
+    sha256 = "1jz72bzk1fh12bs65pv06l85135hgfz1aqnbb084bvqcpj4gl40h";
   };
 
   nativeBuildInputs = [

From 740c780c1d5c23ae603a904df134dd8ed1827ea5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Jan 2020 16:06:06 -0600
Subject: [PATCH 718/755] qt5: remove last vestiges of Qt 5.11

A file was left-over after removing Qt 5.11 at its end-of-life.
---
 .../libraries/qt-5/5.11/default.nix           | 179 ------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.11/default.nix

diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
deleted file mode 100644
index a10c50c9946b..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-
-# Updates
-
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
-2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
-  newScope,
-  stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper,
-  bison, cups ? null, harfbuzz, libGL, perl,
-  gstreamer, gst-plugins-base, gtk3, dconf,
-  llvmPackages_5,
-
-  # options
-  developerBuild ? false,
-  decryptSslTraffic ? false,
-  debug ? false,
-}:
-
-with stdenv.lib;
-
-let
-
-  qtCompatVersion = srcs.qtbase.version;
-
-  stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
-
-  mirror = "https://download.qt.io";
-  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
-    # Community port of the now unmaintained upstream qtwebkit.
-    qtwebkit = {
-      src = fetchFromGitHub {
-        owner = "annulen";
-        repo = "webkit";
-        rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
-        sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
-      };
-      version = "5.212-alpha-01-26-2018";
-    };
-  };
-
-  patches = {
-    qtbase = [
-      ./qtbase.patch
-      ./qtbase-fixguicmake.patch
-      (fetchpatch {
-        url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=a52d7861edfb5956";
-        sha256 = "0as047qybh6w9xz2wd569kixwsibj3qid5nkd3l5w5v3lk80af3v";
-      })
-    ];
-    qtdeclarative = [ ./qtdeclarative.patch ];
-    qtscript = [
-      ./qtscript.patch
-      # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196
-      # fixed in qtscript 5.12.2
-      (fetchpatch {
-        url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff";
-        sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi";
-      })
-    ];
-    qtserialport = [ ./qtserialport.patch ];
-    qttools = [ ./qttools.patch ];
-    qtwebengine = [
-      ./qtwebengine-no-build-skip.patch
-      ./qtwebengine-darwin-no-platform-check.patch
-      # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
-      # https://bugreports.qt.io/browse/QTBUG-77037
-      (fetchpatch {
-        name = "fix-build-with-pulseaudio-13.0.patch";
-        url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
-        sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
-      })
-    ];
-    qtwebkit = [ ./qtwebkit.patch ];
-  };
-
-  qtModule =
-    import ../qtModule.nix
-    {
-      inherit perl;
-      inherit (stdenv) lib;
-      # Use a variant of mkDerivation that does not include wrapQtApplications
-      # to avoid cyclic dependencies between Qt modules.
-      mkDerivation =
-        import ../mkDerivation.nix
-        { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
-        stdenvActual.mkDerivation;
-    }
-    { inherit self srcs patches; };
-
-  addPackages = self: with self;
-    let
-      callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
-    in {
-
-      mkDerivationWith =
-        import ../mkDerivation.nix
-        { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
-
-      mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
-
-      qtbase = callPackage ../modules/qtbase.nix {
-        inherit (srcs.qtbase) src version;
-        patches = patches.qtbase;
-        inherit bison cups harfbuzz libGL;
-        withGtk3 = true; inherit dconf gtk3;
-        inherit developerBuild decryptSslTraffic;
-      };
-
-      qtcharts = callPackage ../modules/qtcharts.nix {};
-      qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
-      qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
-      qtdoc = callPackage ../modules/qtdoc.nix {};
-      qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
-      qtimageformats = callPackage ../modules/qtimageformats.nix {};
-      qtlocation = callPackage ../modules/qtlocation.nix { };
-      qtmacextras = callPackage ../modules/qtmacextras.nix {};
-      qtmultimedia = callPackage ../modules/qtmultimedia.nix {
-        inherit gstreamer gst-plugins-base;
-      };
-      qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
-      qtquick1 = null;
-      qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
-      qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
-      qtscript = callPackage ../modules/qtscript.nix {};
-      qtsensors = callPackage ../modules/qtsensors.nix {};
-      qtserialport = callPackage ../modules/qtserialport.nix {};
-      qtspeech = callPackage ../modules/qtspeech.nix {};
-      qtsvg = callPackage ../modules/qtsvg.nix {};
-      qttools = callPackage ../modules/qttools.nix {};
-      qttranslations = callPackage ../modules/qttranslations.nix {};
-      qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
-      qtwayland = callPackage ../modules/qtwayland.nix {};
-      qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
-      qtwebengine = callPackage ../modules/qtwebengine.nix {};
-      qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
-      qtwebkit = callPackage ../modules/qtwebkit.nix {};
-      qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
-      qtwebview = callPackage ../modules/qtwebview.nix {};
-      qtx11extras = callPackage ../modules/qtx11extras.nix {};
-      qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
-
-      env = callPackage ../qt-env.nix {};
-      full = env "qt-full-${qtbase.version}" ([
-        qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
-        qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
-        qtscript qtsensors qtserialport qtsvg qttools qttranslations
-        qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
-        qtwebview qtx11extras qtxmlpatterns
-      ] ++ optional (!stdenv.isDarwin) qtwayland
-        ++ optional (stdenv.isDarwin) qtmacextras);
-
-      qmake = makeSetupHook {
-        deps = [ self.qtbase.dev ];
-        substitutions = {
-          fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
-        };
-      } ../hooks/qmake-hook.sh;
-
-      wrapQtAppsHook = makeSetupHook {
-        deps =
-          [ self.qtbase.dev makeWrapper ]
-          ++ optional stdenv.isLinux self.qtwayland.dev;
-      } ../hooks/wrap-qt-apps-hook.sh;
-    };
-
-   self = makeScope newScope addPackages;
-
-in self

From 98f4200a0d876a0a1418c3bc501892fef25f5b34 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 22:10:50 +0000
Subject: [PATCH 719/755] gparted: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 6b32c408ed93..1884cb3ce31a 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-1.0.0";
+  name = "gparted-1.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
-    sha256 = "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4";
+    sha256 = "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2";
   };
 
   # Tries to run `pkexec --version` to get version.

From acc1d391560eca6d6d35209b058db2ed731cfe16 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 26 Jan 2020 16:44:16 -0600
Subject: [PATCH 720/755] libsecret: wrap to 80chars per reviewer request

---
 pkgs/development/libraries/libsecret/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 3cbee96c8514..d62fc1508c01 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
-, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3
+, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
+, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
@@ -25,7 +26,10 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc ];
+  nativeBuildInputs = [
+    pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
+    gobject-introspection vala gtk-doc
+  ];
   buildInputs = [ libgcrypt ];
   # optional: build docs with gtk-doc? (probably needs a flag as well)
 
@@ -35,7 +39,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs ];
+  installCheckInputs = [
+    python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs
+  ];
 
   # needs to run after install because typelibs point to absolute paths
   doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib

From dd763ca418c3bb0776c7e71efb9f36670f6aa0c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 26 Jan 2020 16:45:49 -0600
Subject: [PATCH 721/755] teeworlds: meta touchups, per reviewer suggestion

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

diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 9e85714940c2..ff0dfad51a60 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
       Flag.  You can even design your own maps!
     '';
 
-    homepage = https://teeworlds.com/;
+    homepage = "https://teeworlds.com/";
     license = "BSD-style, see `license.txt'";
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 4eba7020b9ec9e5abb249dbf3430beedbf1155cd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 27 Jan 2020 00:19:00 +0100
Subject: [PATCH 722/755] cfdg: 3.0.9 -> 3.2_2, fix build

---
 pkgs/tools/graphics/cfdg/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 2c96e872f4e6..1fd4d3324a0b 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, libpng, bison, flex, ffmpeg }:
+{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }:
 
 stdenv.mkDerivation rec {
   pname = "cfdg";
-  version = "3.0.9";
-  src = fetchurl {
-    sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
-    url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz";
+  version = "3.2_2";
+  src = fetchFromGitHub {
+    owner = "MtnViewJohn";
+    repo = "context-free";
+    rev = "Version${version}";
+    sha256 = "14v1gya7h0p9dj16hw87wpmjfddmkz537w3kjvaribgxxp0gzyz5";
   };
 
-  buildInputs = [ libpng bison flex ffmpeg ];
+  buildInputs = [ libpng bison flex ffmpeg icu ];
 
   postPatch = ''
     sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l
+    sed -e '1i#include <algorithm>' -i src-common/{cfdg,builder,ast}.cpp
   '';
 
   installPhase = ''
@@ -26,8 +29,7 @@ stdenv.mkDerivation rec {
     description = "Context-free design grammar - a tool for graphics generation";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
-    homepage = https://contextfreeart.org/;
+    homepage = "https://contextfreeart.org/";
     license = licenses.gpl2;
-    downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   };
 }

From 5eb3be255e2cdc6c577af3ee47c2a34bcf8d90ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 00:29:41 +0000
Subject: [PATCH 723/755] gradm: 3.1-201608131257 -> 3.1-201903191516

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

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index bea70da995bd..fee183c82599 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gradm";
-  version = "3.1-201608131257";
+  version = "3.1-201903191516";
 
   src  = fetchurl {
     url    = "http://grsecurity.net/stable/${pname}-${version}.tar.gz";
-    sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb";
+    sha256 = "1wszqwaswcf08s9zbvnqzmmfdykyfcy16w8xjia20ypr7wwbd86k";
   };
 
   nativeBuildInputs = [ bison flex ];

From e99ec699a43bde3620e15ac656efa1cebf0e625f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 27 Jan 2020 00:24:48 +0000
Subject: [PATCH 724/755] nixos/bitlbee: don't assign list to users.groups

Warns about loaOf deprecation warning.
---
 nixos/modules/services/networking/bitlbee.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 54fe70f7ccc0..01a16698384a 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -168,8 +168,7 @@ in
         createHome = true;
       };
 
-      users.groups = singleton {
-        name = "bitlbee";
+      users.groups.bitlbee = {
         gid = config.ids.gids.bitlbee;
       };
 

From 05e661f665047984189b96c724f5a5a1745ec7cb Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Tue, 21 Jan 2020 14:35:39 +0100
Subject: [PATCH 725/755] joplin-desktop: Add a desktop Item for joplin-desktop

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

diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index c4b4fdfd42e6..fd91a981e57b 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -1,8 +1,14 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
+{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }:
 
 let
   pname = "joplin-desktop";
   version = "1.0.177";
+  desktopItem = makeDesktopItem {
+     name = "Joplin";
+     exec = "joplin-desktop";
+     type = "Application";
+     desktopName = "Joplin";
+  };
 in appimageTools.wrapType2 rec {
   name = "${pname}-${version}";
   src = fetchurl {
@@ -18,7 +24,12 @@ in appimageTools.wrapType2 rec {
 
   multiPkgs = null; # no 32bit needed
   extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
-  extraInstallCommands = "mv $out/bin/{${name},${pname}}";
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
+    mv $out/bin/{${name},${pname}}
+  '';
+
 
   meta = with lib; {
     description = "An open source note taking and to-do application with synchronisation capabilities";

From 45158b5c65ea064688d1bc0700420ef26f70116a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Jan 2020 07:56:23 +0000
Subject: [PATCH 726/755] poetry2nix: 1.3.0 -> 1.4.0

---
 .../tools/poetry2nix/poetry2nix/cli.nix       |   1 -
 .../tools/poetry2nix/poetry2nix/default.nix   |  19 +-
 .../poetry2nix/poetry2nix/mk-poetry-dep.nix   |  35 +-
 .../tools/poetry2nix/poetry2nix/overrides.nix | 304 +++++++++++++-----
 .../tools/poetry2nix/poetry2nix/pep508.nix    |  16 +-
 5 files changed, 267 insertions(+), 108 deletions(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
index 82759ce7174b..db85d4ddd3c0 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
@@ -25,7 +25,6 @@ pkgs.stdenv.mkDerivation {
 
   buildPhase = ''
     runHook preBuild
-    ${python3.pkgs.black}/bin/black --quiet --check poetry2nix
     patchShebangs poetry2nix
     runHook postBuild
   '';
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index b6d533875523..0d1c243d0975 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -39,7 +39,11 @@ let
       lockData = readTOML poetrylock;
       lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData;
 
-      specialAttrs = [ "poetrylock" "overrides" ];
+      specialAttrs = [
+        "overrides"
+        "poetrylock"
+        "pwd"
+      ];
       passedAttrs = builtins.removeAttrs attrs specialAttrs;
 
       evalPep508 = mkEvalPep508 python;
@@ -87,6 +91,8 @@ let
                 inherit pkgs lib python poetryLib;
               };
               poetry = poetryPkg;
+              # The canonical name is setuptools-scm
+              setuptools-scm = super.setuptools_scm;
             }
           )
           # Null out any filtered packages, we don't want python.pkgs from nixpkgs
@@ -149,7 +155,12 @@ let
 
       pyProject = readTOML pyproject;
 
-      specialAttrs = [ "pyproject" "poetrylock" "overrides" ];
+      specialAttrs = [
+        "overrides"
+        "poetrylock"
+        "pwd"
+        "pyproject"
+      ];
       passedAttrs = builtins.removeAttrs attrs specialAttrs;
 
       getDeps = depAttr: let
@@ -174,9 +185,9 @@ let
 
           format = "pyproject";
 
-          nativeBuildInputs = [ pkgs.yj ];
           buildInputs = mkInput "buildInputs" buildSystemPkgs;
           propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
+          nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj ];
           checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
 
           passthru = {
@@ -186,7 +197,7 @@ let
           postPatch = (passedAttrs.postPatch or "") + ''
             # Tell poetry not to resolve the path dependencies. Any version is
             # fine !
-            yj -tj < pyproject.toml | python ${./pyproject-without-path.py} > pyproject.json
+            yj -tj < pyproject.toml | ${python.interpreter} ${./pyproject-without-path.py} > pyproject.json
             yj -jt < pyproject.json > pyproject.toml
             rm pyproject.json
           '';
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index 95543ca73590..cbfa3dafa753 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -20,7 +20,8 @@
 
 pythonPackages.callPackage (
   { preferWheel ? false
-  }:
+  , ...
+  }@args:
 
     let
 
@@ -82,7 +83,9 @@ pythonPackages.callPackage (
             else (builtins.elemAt (lib.strings.splitString "-" name) 2);
         };
 
-      baseBuildInputs = lib.optional (name != "setuptools_scm" && name != "setuptools-scm") pythonPackages.setuptools_scm;
+      baseBuildInputs = lib.optional (name != "setuptools_scm" && name != "setuptools-scm") pythonPackages.setuptools-scm;
+
+      format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
 
     in
 
@@ -90,26 +93,34 @@ pythonPackages.callPackage (
         pname = name;
         version = version;
 
+        inherit format;
+
         doCheck = false; # We never get development deps
-        dontStrip = true;
-        format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
+
+        # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
+        dontStrip = format == "wheel";
 
         nativeBuildInputs = if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [];
-        buildInputs = baseBuildInputs ++ (if !isSource then (getManyLinuxDeps fileInfo.name).pkg else []);
+        buildInputs = (
+          baseBuildInputs
+          ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
+          ++ lib.optional isLocal buildSystemPkgs
+        );
 
         propagatedBuildInputs =
-          let
-            # Some dependencies like django gets the attribute name django
-            # but dependencies try to access Django
-            deps = builtins.map (d: lib.toLower d) (builtins.attrNames dependencies);
-          in
-            (builtins.map (n: pythonPackages.${n}) deps) ++ (if isLocal then buildSystemPkgs else []);
+          # Some dependencies like django get the attribute name django
+          # but dependencies try to access Django
+          builtins.map (n: pythonPackages.${lib.toLower n}) (builtins.attrNames dependencies);
 
         meta = {
-          broken = ! isCompatible python.version python-versions;
+          broken = ! isCompatible python.pythonVersion python-versions;
           license = [];
         };
 
+        passthru = {
+          inherit args;
+        };
+
         # We need to retrieve kind from the interpreter and the filename of the package
         # Interpreters should declare what wheel types they're compatible with (python type + ABI)
         # Here we can then choose a file based on that info.
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 48b8ff9859be..86260c037036 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -21,11 +21,15 @@ self: super:
     }
   );
 
-  cffi = super.cffi.overrideAttrs (
-    old: {
-      buildInputs = old.buildInputs ++ [ pkgs.libffi ];
-    }
-  );
+  cffi =
+    # cffi is bundled with pypy
+    if self.python.implementation == "pypy" then null else (
+      super.cffi.overrideAttrs (
+        old: {
+          buildInputs = old.buildInputs ++ [ pkgs.libffi ];
+        }
+      )
+    );
 
   cftime = super.cftime.overrideAttrs (
     old: {
@@ -60,9 +64,30 @@ self: super:
     }
   );
 
+  dlib = super.dlib.overrideAttrs (
+    old: {
+      # Parallel building enabled
+      inherit (pkgs.python.pkgs.dlib) patches;
+
+      enableParallelBuilding = true;
+      dontUseCmakeConfigure = true;
+
+      nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs;
+      buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs;
+    }
+  );
+
   # Environment markers are not always included (depending on how a dep was defined)
   enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;
 
+  faker = super.faker.overrideAttrs (
+    old: {
+      postPatch = ''
+        substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' 'setup_requires=[],' || true
+      '';
+    }
+  );
+
   grandalf = super.grandalf.overrideAttrs (
     old: {
       postPatch = ''
@@ -135,22 +160,39 @@ self: super:
   );
 
   matplotlib = super.matplotlib.overrideAttrs (
-    old: {
-      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+    old: let
+      enableGhostscript = old.passthru.enableGhostscript or false;
+      enableGtk3 = old.passthru.enableTk or false;
+      enableQt = old.passthru.enableQt or false;
+      enableTk = old.passthru.enableTk or false;
 
-      XDG_RUNTIME_DIR = "/tmp";
+      inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
 
-      nativeBuildInputs = old.nativeBuildInputs ++ [
-        pkgs.pkgconfig
-      ];
+    in
+      {
+        NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
 
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [
-        pkgs.libpng
-        pkgs.freetype
-      ];
+        XDG_RUNTIME_DIR = "/tmp";
 
-      inherit (super.matplotlib) patches;
-    }
+        buildInputs = old.buildInputs
+        ++ lib.optional enableGhostscript pkgs.ghostscript
+        ++ lib.optional stdenv.isDarwin [ Cocoa ];
+
+        nativeBuildInputs = old.nativeBuildInputs ++ [
+          pkgs.pkgconfig
+        ];
+
+        propagatedBuildInputs = old.propagatedBuildInputs ++ [
+          pkgs.libpng
+          pkgs.freetype
+        ]
+        ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
+        ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
+        ++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
+        ;
+
+        inherit (super.matplotlib) patches;
+      }
   );
 
   # Calls Cargo at build time for source builds and is really tricky to package
@@ -191,7 +233,7 @@ self: super:
 
   numpy = super.numpy.overrideAttrs (
     old: let
-      blas = pkgs.openblasCompat;
+      blas = old.passthru.args.blas or pkgs.openblasCompat;
       blasImplementation = lib.nameFromURL blas.name "-";
       cfg = pkgs.writeTextFile {
         name = "site.cfg";
@@ -222,6 +264,19 @@ self: super:
       }
   );
 
+  peewee = super.peewee.overridePythonAttrs (
+    old: let
+      withPostgres = old.passthru.withPostgres or false;
+      withMysql = old.passthru.withMysql or false;
+    in
+      {
+        buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ];
+        propagatedBuildInputs = old.propagatedBuildInputs
+        ++ lib.optional withPostgres self.psycopg2
+        ++ lib.optional withMysql self.mysql-connector;
+      }
+  );
+
   pillow = super.pillow.overrideAttrs (
     old: {
       nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
@@ -297,84 +352,106 @@ self: super:
     }
   );
 
-  pyqt5 = super.pyqt5.overridePythonAttrs (
-    old: {
-      format = "other";
+  pyqt5 = let
+    drv = super.pyqt5;
+    withConnectivity = drv.passthru.args.withConnectivity or false;
+    withMultimedia = drv.passthru.args.withMultimedia or false;
+    withWebKit = drv.passthru.args.withWebKit or false;
+    withWebSockets = drv.passthru.args.withWebSockets or false;
+  in
+    super.pyqt5.overridePythonAttrs (
+      old: {
+        format = "other";
 
-      nativeBuildInputs = old.nativeBuildInputs ++ [
-        pkgs.pkgconfig
-        pkgs.qt5.qmake
-        pkgs.xorg.lndir
-        pkgs.qt5.qtbase
-        pkgs.qt5.qtsvg
-        pkgs.qt5.qtdeclarative
-        pkgs.qt5.qtwebchannel
-        # self.pyqt5-sip
-        self.sip
-      ];
+        nativeBuildInputs = old.nativeBuildInputs ++ [
+          pkgs.pkgconfig
+          pkgs.qt5.qmake
+          pkgs.xorg.lndir
+          pkgs.qt5.qtbase
+          pkgs.qt5.qtsvg
+          pkgs.qt5.qtdeclarative
+          pkgs.qt5.qtwebchannel
+          # self.pyqt5-sip
+          self.sip
+        ]
+        ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
+        ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia
+        ++ lib.optional withWebKit pkgs.qt5.qtwebkit
+        ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
+        ;
 
-      buildInputs = old.buildInputs ++ [
-        pkgs.dbus
-        pkgs.qt5.qtbase
-        pkgs.qt5.qtsvg
-        pkgs.qt5.qtdeclarative
-        self.sip
-      ];
+        buildInputs = old.buildInputs ++ [
+          pkgs.dbus
+          pkgs.qt5.qtbase
+          pkgs.qt5.qtsvg
+          pkgs.qt5.qtdeclarative
+          self.sip
+        ]
+        ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
+        ++ lib.optional withWebKit pkgs.qt5.qtwebkit
+        ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
+        ;
 
-      # Fix dbus mainloop
-      inherit (pkgs.python3.pkgs.pyqt5) patches;
+        # Fix dbus mainloop
+        patches = pkgs.python3.pkgs.pyqt5.patches or [];
 
-      configurePhase = ''
-        runHook preConfigure
+        configurePhase = ''
+          runHook preConfigure
 
-        export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
+          export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
 
-        mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
-        ${self.python.executable} configure.py  -w \
-          --confirm-license \
-          --no-qml-plugin \
-          --bindir=$out/bin \
-          --destdir=$out/${self.python.sitePackages} \
-          --stubsdir=$out/${self.python.sitePackages}/PyQt5 \
-          --sipdir=$out/share/sip/PyQt5 \
-          --designer-plugindir=$out/plugins/designer
+          mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
+          ${self.python.executable} configure.py  -w \
+            --confirm-license \
+            --no-qml-plugin \
+            --bindir=$out/bin \
+            --destdir=$out/${self.python.sitePackages} \
+            --stubsdir=$out/${self.python.sitePackages}/PyQt5 \
+            --sipdir=$out/share/sip/PyQt5 \
+            --designer-plugindir=$out/plugins/designer
 
-        runHook postConfigure
-      '';
-
-      postInstall = ''
-        ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
-        for i in $out/bin/*; do
-          wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
-        done
-
-        # # Let's make it a namespace package
-        # cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
-        # from pkgutil import extend_path
-        # __path__ = extend_path(__path__, __name__)
-        # EOF
-      '';
-
-      installCheckPhase = let
-        modules = [
-          "PyQt5"
-          "PyQt5.QtCore"
-          "PyQt5.QtQml"
-          "PyQt5.QtWidgets"
-          "PyQt5.QtGui"
-        ];
-        imports = lib.concatMapStrings (module: "import ${module};") modules;
-      in
-        ''
-          echo "Checking whether modules can be imported..."
-          ${self.python.interpreter} -c "${imports}"
+          runHook postConfigure
         '';
 
-      doCheck = true;
+        postInstall = ''
+          ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
+          for i in $out/bin/*; do
+            wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
+          done
 
-      enableParallelBuilding = true;
-    }
-  );
+          # Let's make it a namespace package
+          cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
+          from pkgutil import extend_path
+          __path__ = extend_path(__path__, __name__)
+          EOF
+        '';
+
+        installCheckPhase = let
+          modules = [
+            "PyQt5"
+            "PyQt5.QtCore"
+            "PyQt5.QtQml"
+            "PyQt5.QtWidgets"
+            "PyQt5.QtGui"
+          ]
+          ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
+          ++ lib.optional withWebKit "PyQt5.QtWebKit"
+          ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
+          ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
+          ;
+
+          imports = lib.concatMapStrings (module: "import ${module};") modules;
+        in
+          ''
+            echo "Checking whether modules can be imported..."
+            ${self.python.interpreter} -c "${imports}"
+          '';
+
+        doCheck = true;
+
+        enableParallelBuilding = true;
+      }
+    );
 
   pytest-datadir = super.pytest-datadir.overrideAttrs (
     old: {
@@ -400,9 +477,21 @@ self: super:
     }
   );
 
+  # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs
+  # Make it not fail with infinite recursion
+  pybind11 = super.pybind11.overridePythonAttrs (
+    old: {
+      cmakeFlags = (old.cmakeFlags or []) ++ [
+        "-DPYBIND11_TEST=off"
+      ];
+      doCheck = false; # Circular test dependency
+    }
+  );
+
   scipy = super.scipy.overrideAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
       setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
       enableParallelBuilding = true;
       buildInputs = old.buildInputs ++ [ self.numpy.blas ];
@@ -416,10 +505,27 @@ self: super:
     }
   );
 
+  scikit-learn = super.scikit-learn.overridePythonAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ [
+        pkgs.gfortran
+        pkgs.glibcLocales
+      ] ++ lib.optionals stdenv.cc.isClang [
+        pkgs.llvmPackages.openmp
+      ];
+
+      nativeBuildInputs = old.nativeBuildInputs ++ [
+        self.cython
+      ];
+
+      enableParallelBuilding = true;
+    }
+  );
+
   shapely = super.shapely.overrideAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
-      inherit (super.shapely) patches GEOS_LIBRARY_PATH;
+      inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
     }
   );
 
@@ -431,7 +537,7 @@ self: super:
     }
   );
 
-  vose-alias-method = super.pytest-datadir.overrideAttrs (
+  vose-alias-method = super.vose-alias-method.overrideAttrs (
     old: {
       postInstall = ''
         rm -f $out/LICENSE
@@ -439,6 +545,15 @@ self: super:
     }
   );
 
+  uvloop = super.uvloop.overrideAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [
+        pkgs.darwin.apple_sdk.frameworks.ApplicationServices
+        pkgs.darwin.apple_sdk.frameworks.CoreServices
+      ];
+    }
+  );
+
   # Stop infinite recursion by using bootstrapped pkg from nixpkgs
   wheel = (
     pkgs.python3.pkgs.override {
@@ -450,4 +565,17 @@ self: super:
     }
   );
 
+  zipp =
+    if lib.versionAtLeast super.zipp.version "2.0.0" then (
+      super.zipp.overridePythonAttrs (
+        old: {
+          prePatch = ''
+            substituteInPlace setup.py --replace \
+            'setuptools.setup()' \
+            'setuptools.setup(version="${super.zipp.version}")'
+          '';
+        }
+      )
+    ) else super.zipp;
+
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index 93a395326eb7..ae0c29f36838 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -83,14 +83,24 @@ let
   # This function also performs variable substitution, replacing environment markers with their explicit values
   transformExpressions = exprs: let
     variables = {
-      os_name = "posix"; # TODO: Check other platforms
+      os_name = (
+        if python.pname == "jython" then "java"
+        else "posix"
+      );
       sys_platform = (
         if stdenv.isLinux then "linux"
         else if stdenv.isDarwin then "darwin"
         else throw "Unsupported platform"
       );
       platform_machine = stdenv.platform.kernelArch;
-      platform_python_implementation = "CPython"; # Only CPython supported for now
+      platform_python_implementation = let
+        impl = python.passthru.implementation;
+      in
+        (
+          if impl == "cpython" then "CPython"
+          else if impl == "pypy" then "PyPy"
+          else throw "Unsupported implementation ${impl}"
+        );
       platform_release = ""; # Field not reproducible
       platform_system = (
         if stdenv.isLinux then "Linux"
@@ -100,7 +110,7 @@ let
       platform_version = ""; # Field not reproducible
       python_version = python.passthru.pythonVersion;
       python_full_version = python.version;
-      implementation_name = "cpython"; # Only cpython supported for now
+      implementation_name = python.implementation;
       implementation_version = python.version;
       extra = "";
     };

From 50f3a9f1001b16e93208b650d4fc87c033e26fa6 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Sat, 4 Jan 2020 16:32:59 +0100
Subject: [PATCH 727/755] precice: fix output and cmake

---
 ...l-target-dirs-to-use-the-CMAKE-flags.patch | 112 ++++++++++++++++++
 .../development/libraries/precice/default.nix |  34 ++++--
 2 files changed, 134 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch

diff --git a/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch b/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch
new file mode 100644
index 000000000000..52a4d0b5cccb
--- /dev/null
+++ b/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch
@@ -0,0 +1,112 @@
+From 078cc28a3ece0dcc4033961090a6e5d6e63b3ec5 Mon Sep 17 00:00:00 2001
+From: Scriptkiddi <fritz@otlinghaus.it>
+Date: Sat, 4 Jan 2020 17:59:32 +0100
+Subject: [PATCH] Fix the install target dirs to use the CMAKE flags
+
+---
+ CMakeLists.txt | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96b9d1b5..ff8191ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ project(preCICE VERSION 1.6.1 LANGUAGES CXX)
+ 
+ #
+ # Overview of this configuration
+-# 
++#
+ # PREAMBLE
+ # Setup Options
+ # Find Mandatory Dependencies
+@@ -30,6 +30,7 @@ include(CheckCXX11Library)
+ include(CopyTargetProperty)
+ include(XSDKMacros)
+ include(Validation)
++include(GNUInstallDirs)
+ 
+ # CMake Policies
+ 
+@@ -197,7 +198,7 @@ if(CMAKE_VERSION VERSION_LESS "3.11")
+   endif()
+ endif()
+ 
+-# Add precice as an empty target 
++# Add precice as an empty target
+ add_library(precice ${preCICE_DUMMY})
+ set_target_properties(precice PROPERTIES
+   # precice is a C++11 project
+@@ -267,7 +268,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/DetectGitRevision.cmake)
+ configure_file("${PROJECT_SOURCE_DIR}/src/precice/impl/versions.hpp.in" "${PROJECT_BINARY_DIR}/src/precice/impl/versions.hpp" @ONLY)
+ 
+ # Includes Configuration
+-target_include_directories(precice PUBLIC 
++target_include_directories(precice PUBLIC
+   $<BUILD_INTERFACE:${preCICE_SOURCE_DIR}/src>
+   $<BUILD_INTERFACE:${preCICE_BINARY_DIR}/src>
+   $<INSTALL_INTERFACE:include>
+@@ -282,7 +283,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/sources.cmake)
+ #
+ 
+ add_executable(binprecice "src/drivers/main.cpp")
+-target_link_libraries(binprecice 
++target_link_libraries(binprecice
+   PRIVATE
+   Threads::Threads
+   precice
+@@ -365,18 +366,18 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/tests.cmake)
+ # binprecice - the precice binary
+ install(TARGETS precice binprecice
+   EXPORT preciceTargets
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib
+-  RUNTIME DESTINATION bin
+-  PUBLIC_HEADER DESTINATION include/precice
+-  INCLUDES DESTINATION include/precice
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/precice
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/precice
+   )
+ 
+ if(PRECICE_InstallTest)
+   # Install the testprecice target
+   install(TARGETS testprecice
+     EXPORT preciceTargets
+-    RUNTIME DESTINATION bin
++    RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR}
+     )
+ 
+   # Install the resources necessary for the tests
+@@ -396,7 +397,7 @@ endif()
+ install(EXPORT preciceTargets
+   FILE preciceTargets.cmake
+   NAMESPACE precice::
+-  DESTINATION lib/cmake/precice
++  DESTINATION  ${CMAKE_INSTALL_LIBDIR}/cmake/precice
+   )
+ 
+ # Generate a Package Config File for precice
+@@ -408,7 +409,7 @@ write_basic_package_version_file("preciceConfigVersion.cmake"
+ 
+ # Install the Config and the ConfigVersion files
+ install(FILES "cmake/preciceConfig.cmake" "${preCICE_BINARY_DIR}/preciceConfigVersion.cmake"
+-  DESTINATION lib/cmake/precice
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/precice
+   )
+ 
+ # Setup the config in the build directory
+@@ -477,7 +478,7 @@ configure_file(
+   "lib/pkgconfig/libprecice.pc"
+   @ONLY
+   )
+-install(DIRECTORY "${preCICE_BINARY_DIR}/lib/pkgconfig" 
++install(DIRECTORY "${preCICE_BINARY_DIR}/lib/pkgconfig"
+   DESTINATION lib
+ )
+ 
+-- 
+2.23.1
+
diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
index cdce346fe792..a22df8c18e05 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/pkgs/development/libraries/precice/default.nix
@@ -1,26 +1,35 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python2, python2Packages }:
+{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages }:
 
 stdenv.mkDerivation rec {
   pname = "precice";
-  version = "1.6.1";
+  version = "2020-01-20";
+  # Todo next release switch back to versioning but for python3 support master is needed
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "00631zw6cpm67j35cwad04nwgfcvlxa8p660fwz30pgj2hzdx3d2";
+    rev = "9f778290416416255fc73a495e962def301648b0";
+    sha256 = "1ij43qjbf1aq3lh91gqpviajc8lyl7qkxfccmj5md5vwf88vjaip";
   };
 
-  preConfigure = ''
-    cmakeFlags="-DBUILD_SHARED_LIBS=ON -DPETSC=off"
-  '';
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DPETSC=off"
+    "-DPYTHON_LIBRARIES=${python3.libPrefix}"
+    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m"
+  ];
 
   nativeBuildInputs = [ cmake gcc ];
-  buildInputs = [ boost eigen libxml2 openmpi python2 python2Packages.numpy ];
-  installPhase = ''
-    mkdir -p $out/lib
-    cp libprecice.so libprecice.so.1.6.1 $out/lib/
-  '';
+  buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ];
+  patches = [
+    ./0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch # CMake Packaging is not perfect upstream, after this PR it is https://github.com/precice/precice/pull/577/files
+  ];
+  enableParallelBuilding = true;
+
+  postInstall = ''
+      substituteInPlace "$out"/lib/cmake/precice/preciceTargets.cmake \
+      --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include;' 'INTERFACE_INCLUDE_DIRECTORIES "'$out/include';'
+  ''; # Check if this can be removed after upstream PR 577
 
   meta = {
     description = "preCICE stands for Precise Code Interaction Coupling Environment";
@@ -31,3 +40,4 @@ stdenv.mkDerivation rec {
   };
 }
 
+

From 26dbde5dbcaff6322cc649ac17150214ee259f9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2020 09:34:41 +0100
Subject: [PATCH 728/755] haskell-pandoc: disable test suite when building with
 ghc-8.8.x

pandoc-2.9.1.1 fails 1 test.
---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index f49aa03e07e0..be852679c9a5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -91,7 +91,7 @@ self: super: {
   microlens-th = self.microlens-th_0_4_3_2;
   network = self.network_3_1_1_1;
   optparse-applicative = self.optparse-applicative_0_15_1_0;
-  pandoc = self.pandoc_2_9_1_1;
+  pandoc = dontCheck super.pandoc_2_9_1_1;        # https://github.com/jgm/pandoc/issues/6086
   pandoc-types = self.pandoc-types_1_20;
   prettyprinter = self.prettyprinter_1_6_0;
   primitive = dontCheck super.primitive_0_7_0_0;  # evaluating the test suite gives an infinite recursion

From f18604531390273733757ec36097699c469a9ab5 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Fri, 24 Jan 2020 21:02:54 +0100
Subject: [PATCH 729/755] foxtrotgps: init at 1.2.2

---
 pkgs/applications/misc/foxtrotgps/default.nix | 40 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/foxtrotgps/default.nix

diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix
new file mode 100644
index 000000000000..dc3f1922c214
--- /dev/null
+++ b/pkgs/applications/misc/foxtrotgps/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2
+, intltool, libexif, python3Packages, sqlite }:
+
+stdenv.mkDerivation rec {
+  pname = "foxtrotgps";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz";
+    sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg";
+  };
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+
+  buildInputs = [
+    curl.dev
+    gnome2.libglade.dev
+    gpsd
+    gtk2.dev
+    intltool
+    libexif
+    sqlite.dev
+    (python3Packages.python.withPackages (pythonPackages: with python3Packages;
+    [ beautifulsoup4 feedparser sqlalchemy ]))
+    ];
+
+  meta = with stdenv.lib; {
+    description = "GPS/GIS application optimized for small screens";
+    longDescription = ''
+      An easy to use, free & open-source GPS/GIS application that works well on
+      small screens, and is especially suited to touch input. It spun off of
+      tangoGPS in 2010 with a focus on cooperation and fostering community
+      innovation.
+    '';
+    homepage = "https://www.foxtrotgps.org/";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wucke13 ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 68dfe49545a4..371bdcd1bf1b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -414,6 +414,7 @@ mapAliases ({
   system_config_printer = system-config-printer;  # added 2016-01-03
   systool = sysfsutils; # added 2018-04-25
   tahoelafs = tahoe-lafs; # added 2018-03-26
+  tangogps = foxtrotgps; # added 2020-01-26
   telepathy_farstream = telepathy-farstream; # added 2018-02-25
   telepathy_gabble = telepathy-gabble; # added 2018-02-25
   telepathy_glib = telepathy-glib; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b75b39b833cf..a7c0ce934d54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19178,6 +19178,8 @@ in
 
   formatter = callPackage ../applications/misc/formatter { };
 
+  foxtrotgps = callPackage ../applications/misc/foxtrotgps { };
+
   fractal = callPackage ../applications/networking/instant-messengers/fractal { };
 
   freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; };

From 59143980310f7823a07157bd7ca31cd871675241 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 08:59:10 +0000
Subject: [PATCH 730/755] mpd_clientlib: 2.17 -> 2.18

---
 pkgs/servers/mpd/clientlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index c6b36fed8eb8..f19d3a1e18a1 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.17";
+  version = "2.18";
   pname = "libmpdclient";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "0458zq12ph1pbm9mcbdj8mm31iq3yzzc1aq9fhfwz341zwpwcp21";
+    sha256 = "0p2dw3jwyl34azzvr9bm7q6ni8v4ix9qr5lig62xskvrrbjfc4a6";
   };
 
   nativeBuildInputs = [ meson ninja ]

From e838bebc78591ba474889a329714cdd57bb04938 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 19:11:20 +0000
Subject: [PATCH 731/755] cjdns: 20.4 -> 20.5

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

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index df94de882be6..7dce5dc10443 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
-let version = "20.4"; in
+let version = "20.5"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "cjdelisle";
     repo = "cjdns";
     rev = "cjdns-v${version}";
-    sha256 = "1d8li7vws1dmdgs96dmy4vh55gqy2ir4dnkrvgkv3fjq9pffr7vx";
+    sha256 = "13f174bmbyqna899naja4fzpma3yaw815ylksk8klcc3glg07v7b";
   };
 
   buildInputs = [ which python27 nodejs ] ++

From b949937fd19a377c904f2dbe602745a9ad6060ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Mon, 27 Jan 2020 13:56:22 +0100
Subject: [PATCH 732/755] libimobiledevice: 2019-11-29 -> 2020-01-20

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

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index ca643efb70c2..950fe3e37187 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libimobiledevice";
-  version = "2019-11-29";
+  version = "2020-01-20";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "9f79242a441ce37c28db2b84d49621d26418dc53";
-    sha256 = "1hs0hppsfyhjx47jk2j8n5riqjyrdqvdkc0z0kry0sw09c80zjnr";
+    rev = "61babf5f54e7734ebf3044af4c6294524d4b29b5";
+    sha256 = "02dnq6xza72li52kk4p2ak0gq2js3ssfp2fpjlgsv0bbn5mkg2hi";
   };
 
   outputs = [ "out" "dev" ];

From 449c1f88b46df1ae5942da9efcb70c46e0845f71 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 27 Jan 2020 14:30:04 +0100
Subject: [PATCH 733/755] libversion: 2.9.0 -> 3.0.1

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

diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 3c7ed207703b..5d1449e3530e 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -2,17 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "libversion";
-  version = "2.9.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "repology";
     repo = "libversion";
     rev = version;
-    sha256 = "0h0yfcgxll09dckzjb1im3yf54cjkpsflr7r4kwz1jcr3fxq41fz";
+    sha256 = "13x5djdpv6aryxsbw6a3b6vwzi9f4aa3gn9dqb7axzppggayawyk";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  preCheck = ''
+    export LD_LIBRARY_PATH=/build/source/build/libversion/:$LD_LIBRARY_PATH
+  '';
   doCheck = true;
   checkTarget = "test";
 

From 36da345caa1e4185f62758016c7eaf88d04e8066 Mon Sep 17 00:00:00 2001
From: Andreas Brenk <mail@andreasbrenk.com>
Date: Mon, 30 Sep 2019 20:20:25 +0200
Subject: [PATCH 734/755] nixos/sshguard: use nftables backend if enabled

The current module assumes use of iptables and breaks if nftables is
used instead.

This change configures the correct backend based on the
config.networking.nftables.enable setting.
---
 nixos/modules/services/security/sshguard.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index 4a174564dd2c..e7a9cefdef30 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -92,8 +92,11 @@ in {
         "-o cat"
         "-n1"
       ] ++ (map (name: "-t ${escapeShellArg name}") cfg.services));
+      backend = if config.networking.nftables.enable
+        then "sshg-fw-nft-sets"
+        else "sshg-fw-ipset";
     in ''
-      BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"
+      BACKEND="${pkgs.sshguard}/libexec/${backend}"
       LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"
     '';
 
@@ -104,7 +107,9 @@ in {
       after = [ "network.target" ];
       partOf = optional config.networking.firewall.enable "firewall.service";
 
-      path = with pkgs; [ iptables ipset iproute systemd ];
+      path = with pkgs; if config.networking.nftables.enable
+        then [ nftables iproute systemd ]
+        else [ iptables ipset iproute systemd ];
 
       # The sshguard ipsets must exist before we invoke
       # iptables. sshguard creates the ipsets after startup if
@@ -112,14 +117,14 @@ in {
       # the iptables rules because postStart races with the creation
       # of the ipsets. So instead, we create both the ipsets and
       # firewall rules before sshguard starts.
-      preStart = ''
+      preStart = optionalString config.networking.firewall.enable ''
         ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet
         ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
         ${pkgs.iptables}/bin/iptables  -I INPUT -m set --match-set sshguard4 src -j DROP
         ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP
       '';
 
-      postStop = ''
+      postStop = optionalString config.networking.firewall.enable ''
         ${pkgs.iptables}/bin/iptables  -D INPUT -m set --match-set sshguard4 src -j DROP
         ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
         ${pkgs.ipset}/bin/ipset -quiet destroy sshguard4

From faab2914f3c3ef888e0826ee7a58e2f55d120d22 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 27 Jan 2020 12:44:42 +0100
Subject: [PATCH 735/755] tdesktop: Remove NIX_CFLAGS_COMPILE and CPPFLAGS

This is not required anymore and therefore a refactoring/cleanup
(verified with diffoscope that only the output paths change).
Credit to @ilya-fedin for bringing this to my attention.
---
 .../telegram/tdesktop/default.nix                  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3f6d9c498980..6f7dc89f1e7c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -64,20 +64,6 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${minizip}/include/minizip"
-    # See Telegram/gyp/qt.gypi
-    "-I${getDev qtbase}/mkspecs/linux-g++"
-  ] ++ concatMap (x: [
-    "-I${getDev qtbase}/include/${x}"
-    "-I${getDev qtbase}/include/${x}/${qtbase.version}"
-    "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
-    "-I${getDev libopus}/include/opus"
-    "-I${getDev alsaLib}/include/alsa"
-    "-I${getDev libpulseaudio}/include/pulse"
-    ]) [ "QtCore" "QtGui" "QtDBus" ];
-  CPPFLAGS = NIX_CFLAGS_COMPILE;
-
   cmakeFlags = [
     "-Ddisable_autoupdate=ON"
     #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs

From a58404485592b22983e080c711136c8c20a1e37b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 27 Jan 2020 19:02:50 +0100
Subject: [PATCH 736/755] python38Packages.tatsu: 4.4.0 -> 5.0.0

Changelog: https://github.com/neogeny/TatSu/blob/v5.0.0/CHANGELOG.rst#500--2020-01-26

I've successfully tested the Python 3.7 support with
python3Packages.ics.
---
 pkgs/development/python-modules/tatsu/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 539cbdca3ee1..922ca1b9b957 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -6,15 +6,23 @@
 
 buildPythonPackage rec {
   pname = "TatSu";
-  version = "4.4.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "neogeny";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jjd73yr3x56ij2ggxf6s62mf90i9v7wn3i0h67zxys55hlp2yh4";
+    sha256 = "1c16fcxf0xjkh5py9bnj6ljb9krhrj57mkwayl1w1dvzwl5lkgj3";
   };
 
+  # Since version 5.0.0 only >=3.8 is officially supported, but ics is not
+  # compatible with Python 3.8 due to aiohttp:
+  disabled = pythonOlder "3.7";
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "python_requires='>=3.8'," "python_requires='>=3.7',"
+  '';
+
   nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ colorama mypy pyyaml regex ]
     ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ]

From e29829b2bdb6a23554ae3805680d976b5c622c47 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 20:00:39 +0000
Subject: [PATCH 737/755] python27Packages.identify: 1.4.9 -> 1.4.10

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

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index bfe039382aca..86d1617852b8 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f44e637caa40d1b4cb37f6ed3b262ede74901d28b1cc5b1fc07360871edd65d";
+    sha256 = "0q1k22n8w7mmab1vh2r3bsqbxkxbb2zka548rcnn2rd9yg8rxnca";
   };
 
   # Tests not included in PyPI tarball

From c0ed884be6080aba6f3bebbda474427d0e03da10 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Mon, 27 Jan 2020 21:28:36 +0100
Subject: [PATCH 738/755] spotifyd: 0.2.23 -> 0.2.24

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

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index b80638110306..30cedfa8bb8f 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.2.23";
+  version = "0.2.24";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
     rev = "v${version}";
-    sha256 = "0xxr21avgr4pvlr5vgb68jmad5xy5kqvaxfzh0qn1jpiax7y3avm";
+    sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
   };
 
-  cargoSha256 = "1ykmn7zzwn9my96bbxwkparab5lck1zzdkpafil2mmrjyvyi40da";
+  cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";
 
   cargoBuildFlags = [
     "--no-default-features"

From 31601a384409cea04b22edc833cbf7f0fc3eff42 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Mon, 27 Jan 2020 22:31:22 +0200
Subject: [PATCH 739/755] nixos/doc: add a section mentioning GitHub team for
 nixos release managers (#78625)

* nixos/doc: add a section mentioning GitHub team for nixos release managers

This team should be kept up-to-date with each release.

Previously this info had to be grepped from appropriate Discourse thread.

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 nixos/doc/manual/development/releases.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 9371af9984d1..a22a0a3707b4 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -187,7 +187,7 @@
     </listitem>
     <listitem>
      <para>
-      Update "Chapter 4. Upgrading NixOS" section of the manual to match 
+      Update "Chapter 4. Upgrading NixOS" section of the manual to match
       new stable release version.
      </para>
     </listitem>
@@ -236,6 +236,10 @@
    introduced to their role, making it easier to pass on knowledge and
    experience.
   </para>
+  <para>
+   Release managers for the current NixOS release are tracked by GitHub team
+   <link xlink:href="https://github.com/orgs/NixOS/teams/nixos-release-managers/members"><literal>@NixOS/nixos-release-managers</literal></link>.
+  </para>
   <para>
    A release manager's role and responsibilities are:
   </para>

From 5e46d5a7b59d69e7b86239195f58d26277ae0370 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 27 Jan 2020 18:49:39 +0100
Subject: [PATCH 740/755] tdesktop: Remove the last custom patch from Arch
 Linux

This patch is not required anymore [0][1].
Thanks @ilya-fedin for pointing this out.

[0]: https://git.archlinux.org/svntogit/community.git/commit/?id=a6dbffec8b2f6f319822df8b7db3ba66f81407ce
[1]: https://bugs.archlinux.org/task/65259
---
 .../telegram/tdesktop/default.nix             | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 6f7dc89f1e7c..e1a40c06d18f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -10,17 +10,15 @@
 with lib;
 
 # Main reference:
-# - This package is based on the Arch package:
+# - This package was originally based on the Arch package but all patches are now upstreamed:
 #   https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
-# Other references that could be useful (but we should try to stick to Arch):
+# Other references that could be useful:
 # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD
 # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template
 
 mkDerivation rec {
   pname = "telegram-desktop";
   version = "1.9.8";
-  # Note: Due to our strong dependency on the Arch patches it's probably best
-  # to also wait for the Arch update (especially if the patches don't apply).
 
   # Telegram-Desktop with submodules
   src = fetchurl {
@@ -28,20 +26,6 @@ mkDerivation rec {
     sha256 = "1rq3180l4ly0n0jj08cxy9l2d07scwp9hasmliva2xspyv7i9ksd";
   };
 
-  # Arch patches (svn export telegram-desktop/trunk)
-  archPatches = fetchsvn {
-    url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
-    # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    rev = "554983";
-    sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j";
-  };
-
-  # Note: It would be best if someone could get as many patches upstream as
-  # possible (we currently depend a lot on custom patches...).
-  patches = [
-    "${archPatches}/0005-Use-system-wide-fonts.patch"
-  ];
-
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
       --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
@@ -66,9 +50,9 @@ mkDerivation rec {
 
   cmakeFlags = [
     "-Ddisable_autoupdate=ON"
-    #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs
-    "-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271
-    "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
+    # TODO: Officiall API credentials for Nixpkgs
+    # (see: https://github.com/NixOS/nixpkgs/issues/55271):
+    "-DTDESKTOP_API_TEST=ON"
     "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
     "-DDESKTOP_APP_USE_PACKAGED=ON"
     "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"

From ddec4efa7c89f6e16e8e4c74b7b64a1a66216ec9 Mon Sep 17 00:00:00 2001
From: Hugo Reeves <hugolreeves@gmail.com>
Date: Tue, 28 Jan 2020 09:56:18 +1300
Subject: [PATCH 741/755] croc: 6.4.8 -> 6.4.10

---
 pkgs/tools/networking/croc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index fee1e9ee3acf..b7782267b38f 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "6.4.8";
+  version = "6.4.10";
 
   goPackagePath = "github.com/schollz/croc";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03wm7agjwky9ma321x6as76rg053cagmni9ygwls82jjs2pvv0bv";
+    sha256 = "1w16k0h9zk4q6icyf79jw4zc1jy2h9yzw0bcmywq0pz0pqk6z4nw";
   };
 
-  modSha256 = "011pcmfih8lg8l7hwdsq51p5brnhsddzv7mvsaw5sfv8nq9p8zc2";
+  modSha256 = "069n9593jfrlbrfnzr4mxvs1v1y4fvgnc9kawahh2a1rzh3cxrvq";
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {

From da75d85571792df2c67abe03dc6c8632c7e07e7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 21:02:19 +0000
Subject: [PATCH 742/755] python27Packages.deap: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix
index e78a3f5eba03..9c49057398c9 100644
--- a/pkgs/development/python-modules/deap/default.nix
+++ b/pkgs/development/python-modules/deap/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deap";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "102r11pxb36xkq5bjv1lpkss77v278f5xdv6lvkbjdvqryydf3yd";
+    sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i";
   };
 
   propagatedBuildInputs = [ numpy matplotlib ];

From 0f2536f15b6c8ec841ea6b9c761602612f6cf75f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 7 Aug 2019 19:53:47 -0400
Subject: [PATCH 743/755] nixos/release: rename iso_graphical to iso_plasma5

And all the other things and paths to match it
---
 ...nix => installation-cd-graphical-plasma5-new-kernel.nix} | 2 +-
 ...phical-kde.nix => installation-cd-graphical-plasma5.nix} | 0
 nixos/release-combined.nix                                  | 2 +-
 nixos/release.nix                                           | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical-kde-new-kernel.nix => installation-cd-graphical-plasma5-new-kernel.nix} (55%)
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical-kde.nix => installation-cd-graphical-plasma5.nix} (100%)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
similarity index 55%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
index 3336d512cfd8..d98325a99ac2 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-graphical-kde.nix ];
+  imports = [ ./installation-cd-graphical-plasma5.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ca9c6f9a7f91..b46731863cab 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -54,7 +54,7 @@ in rec {
         (all nixos.dummy)
         (all nixos.manual)
 
-        nixos.iso_graphical.x86_64-linux or []
+        nixos.iso_plasma5.x86_64-linux or []
         nixos.iso_minimal.aarch64-linux or []
         nixos.iso_minimal.i686-linux or []
         nixos.iso_minimal.x86_64-linux or []
diff --git a/nixos/release.nix b/nixos/release.nix
index 9109f5751eb5..512ba7143977 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -149,9 +149,9 @@ in rec {
     inherit system;
   });
 
-  iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
-    type = "graphical";
+  iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;
+    type = "plasma5";
     inherit system;
   });
 

From 5bee42b6b4f63cf493fea167b7f4ff346bf9c7c6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 28 Jan 2020 08:06:11 +1000
Subject: [PATCH 744/755] conmon: 2.0.9 -> 2.0.10

---
 pkgs/applications/virtualization/conmon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 49d14d25babf..802272c4b5d7 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -9,13 +9,13 @@
 stdenv.mkDerivation rec {
   project = "conmon";
   name = "${project}-${version}";
-  version = "2.0.9";
+  version = "2.0.10";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = project;
     rev = "v${version}";
-    sha256 = "0wy3nihif9ih62rlskrjysshfaxdl878fj5ni1zfb9db4nsx6z0m";
+    sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f2d6f567ee6f8d616b38a76065198912aa8be14e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 22:28:25 +0000
Subject: [PATCH 745/755] python37Packages.django_modelcluster: 5.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 4efd2002b1fd..943f94914985 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "django-modelcluster";
-  version = "5.0";
+  version = "5.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zcn1b0lp9dg6xvz8p8v1hrrgqj71izqalqz2dp1nz5rbj3s34x2";
+    sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg";
   };
 
   disabled = pythonOlder "3.5";

From 0c40662294654d83944e2c4be1da75d5155a1025 Mon Sep 17 00:00:00 2001
From: kjuvi <quentin.vaucher@protonmail.com>
Date: Mon, 27 Jan 2020 23:41:19 +0100
Subject: [PATCH 746/755] timetable: 1.0.9 -> 1.1.0

---
 pkgs/applications/office/timetable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index c652f7656877..1a63fdf0f3f3 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timetable";
-  version = "1.0.9";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f";
+    sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb";
   };
 
   nativeBuildInputs = [

From de84b23e5c615a7892576807f6622ad416daeeae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 18:54:27 +0000
Subject: [PATCH 747/755] python27Packages.braintree: 3.57.1 -> 3.58.0

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

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 6f51dcf858f4..b96e0b7874a6 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "3.57.1";
+  version = "3.58.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g5w733dim3rc6hwklvknnxqkradjwip728i77pbsw5ihgdxahhi";
+    sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4";
   };
 
   propagatedBuildInputs = [ requests ];

From 403813ddaa4f08625571cc1521243ada69eb1391 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 18:46:02 +0000
Subject: [PATCH 748/755] python27Packages.mozdevice: 3.0.6 -> 3.0.7

---
 .../python-modules/marionette-harness/mozdevice.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 9b5216899367..9f1a682c2ce3 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "mozdevice";
-  version = "3.0.6";
+  version = "3.0.7";
   format = "wheel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gw2lk16fz2n1953i29hgw47s2h0c6z911zzg8am1in8qq2318xv";
+    sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5";
     format = "wheel";
   };
 

From 9414f03d97c6f6ce57dae792a8e25d4931594acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Tue, 28 Jan 2020 00:32:11 +0100
Subject: [PATCH 749/755] nixos/alertmanager: Fix startup

Fixed a problem with quotation marks introduced in commit
23d5d9bbe9aab982d17ad92c0d9da291d01f60c7 merged with #78358.
---
 nixos/modules/services/monitoring/prometheus/alertmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 2e8433fbc888..4534d150885e 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -157,8 +157,8 @@ in {
         wantedBy = [ "multi-user.target" ];
         after    = [ "network.target" ];
         preStart = ''
-           ${lib.getBin pkgs.envsubst}/bin/envsubst -o /tmp/alert-manager-substituted.yaml" \
-                                                    -i ${alertmanagerYml}"
+           ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/tmp/alert-manager-substituted.yaml" \
+                                                    -i "${alertmanagerYml}"
         '';
         serviceConfig = {
           Restart  = "always";

From 19ff097181fdaf4a84c2087f1bc59fa6b0304b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 28 Jan 2020 00:55:33 +0100
Subject: [PATCH 750/755] pythonPackages.Babel: Add comment about #75676

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

diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix
index ef86aedc527b..1aafee5bec49 100644
--- a/pkgs/development/python-modules/Babel/default.nix
+++ b/pkgs/development/python-modules/Babel/default.nix
@@ -13,6 +13,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest freezegun ];
 
+  # Note that a test will fail with an encoding error on Python 2 with Nix < 2.3
+  # due to https://github.com/NixOS/nixpkgs/pull/75676#issuecomment-579008837.
+  # TODO: Remove the above comment when we use a version that includes the fix
+  #       from https://github.com/python-babel/babel/pull/691
   doCheck = !stdenv.isDarwin;
 
   meta = with lib; {

From d6464b8add0895cdd54a6eafd07918f87fab22b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 28 Jan 2020 03:01:28 +0000
Subject: [PATCH 751/755] python27Packages.pysrt: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 514ff6eb8fe1..f383854d5b44 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pysrt";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "byroot";
     repo = "pysrt";
     rev = "v${version}";
-    sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn";
+    sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg";
   };
 
   checkInputs = [ nose ];

From a6b6fe115eabff1fd85893943f10d57b547ce8f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 28 Jan 2020 02:41:11 +0000
Subject: [PATCH 752/755] python27Packages.uproot: 3.11.0 -> 3.11.1

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 812ff15242cd..f5f20ad86d3f 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a9521786d0e16d00a457807e364229ba844ea5f8b0ac6653b00277351f12ab49";
+    sha256 = "1m6yjvdbffyk32gmfki7h01frlg9vhqf8g734m4gxyyf8m8g60zd";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From f14a4d60b74625547ba7fc0572e42e9b61c0e54f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 27 Jan 2020 23:24:35 -0500
Subject: [PATCH 753/755] Revert "clang_7,clang_8,clang_9: fix compilation of
 HIP-code"

This reverts commit 558af6fbc7c15f472658339668113f4d5c6440e0.

This was meant for staging. Will apply there.
---
 .../llvm/7/clang/HIP-use-PATH-7.patch         | 68 ----------------
 .../compilers/llvm/7/clang/default.nix        | 10 +--
 pkgs/development/compilers/llvm/7/default.nix |  1 -
 .../llvm/8/clang/HIP-use-PATH-8.patch         | 80 -------------------
 .../compilers/llvm/8/clang/default.nix        |  6 +-
 pkgs/development/compilers/llvm/8/default.nix |  1 -
 .../llvm/9/clang/HIP-use-PATH-9.patch         | 80 -------------------
 .../compilers/llvm/9/clang/default.nix        |  6 +-
 pkgs/development/compilers/llvm/9/default.nix |  1 -
 9 files changed, 7 insertions(+), 246 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
 delete mode 100644 pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
 delete mode 100644 pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch

diff --git a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch b/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
deleted file mode 100644
index 764dddd966cb..000000000000
--- a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8412cba68835f8f4cc527d02194b181faa5944d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
-Date: Tue, 21 Jan 2020 19:46:09 +0100
-Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
-
-This change replaces the manual building of executable paths
-using llvm::sys::path::append with GetProgramPath.
-This enables adding other paths in case executables reside
-in different directories and makes the code easier to read.
-
-Differential Revision: https://reviews.llvm.org/D72903
----
- clang/lib/Driver/ToolChains/HIP.cpp | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
-index 03acf45a9b3..75fd3226c75 100644
---- a/lib/Driver/ToolChains/HIP.cpp
-+++ b/lib/Driver/ToolChains/HIP.cpp
-@@ -98,9 +98,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpName));
-   CmdArgs.push_back(OutputFileName);
--  SmallString<128> ExecPath(C.getDriver().Dir);
--  llvm::sys::path::append(ExecPath, "llvm-link");
--  const char *Exec = Args.MakeArgString(ExecPath);
-+  const char *Exec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
-   return OutputFileName;
- }
-@@ -141,9 +140,8 @@ const char *AMDGCN::Linker::constructOptCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
-   OptArgs.push_back(OutputFileName);
--  SmallString<128> OptPath(C.getDriver().Dir);
--  llvm::sys::path::append(OptPath, "opt");
--  const char *OptExec = Args.MakeArgString(OptPath);
-+  const char *OptExec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
-   return OutputFileName;
- }
-@@ -161,9 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
-   const char *LlcOutputFile =
-       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
-   LlcArgs.push_back(LlcOutputFile);
--  SmallString<128> LlcPath(C.getDriver().Dir);
--  llvm::sys::path::append(LlcPath, "llc");
--  const char *Llc = Args.MakeArgString(LlcPath);
-+  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
-   return LlcOutputFile;
- }
-@@ -178,9 +174,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
-   ArgStringList LldArgs{"-flavor",    "gnu", "--no-undefined",
-                         "-shared",    "-o",  Output.getFilename(),
-                         InputFileName};
--  SmallString<128> LldPath(C.getDriver().Dir);
--  llvm::sys::path::append(LldPath, "lld");
--  const char *Lld = Args.MakeArgString(LldPath);
-+  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
- }
- 
--- 
-2.23.1
-
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index 825b4abb3e3b..5ac9a7a2672a 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm lld ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -38,11 +38,7 @@ let
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
 
-    patches = [
-      ./purity.patch
-      # make clang -xhip use $PATH to find executables
-      ./HIP-use-PATH-7.patch
-    ];
+    patches = [ ./purity.patch ];
 
     postPatch = ''
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 2c3e285e22bf..621a246225d7 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -32,7 +32,6 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
-      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {
diff --git a/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch b/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
deleted file mode 100644
index f4be100d1ab9..000000000000
--- a/pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d9f1b7d7571b252e0ba2359ae6cfa93a9903c0e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
-Date: Tue, 21 Jan 2020 19:49:44 +0100
-Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
-
-This change replaces the manual building of executable paths
-using llvm::sys::path::append with GetProgramPath.
-This enables adding other paths in case executables reside
-in different directories and makes the code easier to read.
-
-Differential Revision: https://reviews.llvm.org/D72903
----
- clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
- 1 file changed, 8 insertions(+), 15 deletions(-)
-
-diff --git a/lib/Driver/ToolChains/HIP.cpp b/lang/lib/Driver/ToolChains/HIP.cpp
-index 868765cf88e..31f2d68ec6c 100644
---- a/lib/Driver/ToolChains/HIP.cpp
-+++ b/lib/Driver/ToolChains/HIP.cpp
-@@ -104,9 +104,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpName));
-   CmdArgs.push_back(OutputFileName);
--  SmallString<128> ExecPath(C.getDriver().Dir);
--  llvm::sys::path::append(ExecPath, "llvm-link");
--  const char *Exec = Args.MakeArgString(ExecPath);
-+  const char *Exec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
-   return OutputFileName;
- }
-@@ -147,9 +146,8 @@ const char *AMDGCN::Linker::constructOptCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
-   OptArgs.push_back(OutputFileName);
--  SmallString<128> OptPath(C.getDriver().Dir);
--  llvm::sys::path::append(OptPath, "opt");
--  const char *OptExec = Args.MakeArgString(OptPath);
-+  const char *OptExec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
-   return OutputFileName;
- }
-@@ -167,9 +165,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
-   const char *LlcOutputFile =
-       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
-   LlcArgs.push_back(LlcOutputFile);
--  SmallString<128> LlcPath(C.getDriver().Dir);
--  llvm::sys::path::append(LlcPath, "llc");
--  const char *Llc = Args.MakeArgString(LlcPath);
-+  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
-   return LlcOutputFile;
- }
-@@ -184,9 +180,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
-   ArgStringList LldArgs{"-flavor",    "gnu", "--no-undefined",
-                         "-shared",    "-o",  Output.getFilename(),
-                         InputFileName};
--  SmallString<128> LldPath(C.getDriver().Dir);
--  llvm::sys::path::append(LldPath, "lld");
--  const char *Lld = Args.MakeArgString(LldPath);
-+  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
- }
- 
-@@ -218,9 +212,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
-       Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
-   BundlerArgs.push_back(BundlerOutputArg);
- 
--  SmallString<128> BundlerPath(C.getDriver().Dir);
--  llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
--  const char *Bundler = Args.MakeArgString(BundlerPath);
-+  const char *Bundler = Args.MakeArgString(
-+          T.getToolChain().GetProgramPath("clang-offload-bundler"));
-   C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
- }
- 
--- 
-2.23.1
-
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 7d7b67adaf04..8c540e45b286 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm lld ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -50,8 +50,6 @@ let
       ./unwindlib.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
-      # make clang -xhip use $PATH to find executables
-      ./HIP-use-PATH-8.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index f389d1814c0c..36d7a14142b4 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -32,7 +32,6 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
-      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {
diff --git a/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch b/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch
deleted file mode 100644
index 102d810ff681..000000000000
--- a/pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7147e9774c74abcd1d6db24e24d0fd989c2b97dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
-Date: Tue, 21 Jan 2020 19:52:04 +0100
-Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
-
-This change replaces the manual building of executable paths
-using llvm::sys::path::append with GetProgramPath.
-This enables adding other paths in case executables reside
-in different directories and makes the code easier to read.
-
-Differential Revision: https://reviews.llvm.org/D72903
----
- clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
- 1 file changed, 8 insertions(+), 15 deletions(-)
-
-diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
-index 2ec97e798fd..735c302debb 100644
---- a/lib/Driver/ToolChains/HIP.cpp
-+++ b/lib/Driver/ToolChains/HIP.cpp
-@@ -66,9 +66,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpName));
-   CmdArgs.push_back(OutputFileName);
--  SmallString<128> ExecPath(C.getDriver().Dir);
--  llvm::sys::path::append(ExecPath, "llvm-link");
--  const char *Exec = Args.MakeArgString(ExecPath);
-+  const char *Exec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
-   return OutputFileName;
- }
-@@ -114,9 +113,8 @@ const char *AMDGCN::Linker::constructOptCommand(
-   const char *OutputFileName =
-       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
-   OptArgs.push_back(OutputFileName);
--  SmallString<128> OptPath(C.getDriver().Dir);
--  llvm::sys::path::append(OptPath, "opt");
--  const char *OptExec = Args.MakeArgString(OptPath);
-+  const char *OptExec =
-+      Args.MakeArgString(getToolChain().GetProgramPath("opt"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
-   return OutputFileName;
- }
-@@ -156,9 +154,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
-   const char *LlcOutputFile =
-       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
-   LlcArgs.push_back(LlcOutputFile);
--  SmallString<128> LlcPath(C.getDriver().Dir);
--  llvm::sys::path::append(LlcPath, "llc");
--  const char *Llc = Args.MakeArgString(LlcPath);
-+  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
-   return LlcOutputFile;
- }
-@@ -172,9 +168,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
-   // The output from ld.lld is an HSA code object file.
-   ArgStringList LldArgs{
-       "-flavor", "gnu", "-shared", "-o", Output.getFilename(), InputFileName};
--  SmallString<128> LldPath(C.getDriver().Dir);
--  llvm::sys::path::append(LldPath, "lld");
--  const char *Lld = Args.MakeArgString(LldPath);
-+  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
- }
- 
-@@ -206,9 +200,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
-       Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
-   BundlerArgs.push_back(BundlerOutputArg);
- 
--  SmallString<128> BundlerPath(C.getDriver().Dir);
--  llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
--  const char *Bundler = Args.MakeArgString(BundlerPath);
-+  const char *Bundler = Args.MakeArgString(
-+      T.getToolChain().GetProgramPath("clang-offload-bundler"));
-   C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
- }
- 
--- 
-2.23.1
-
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 1eefb9d0a837..1b779b118a7f 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python, lld
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libxml2 llvm lld ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
@@ -43,8 +43,6 @@ let
       ./purity.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
-      # make clang -xhip use $PATH to find executables
-      ./HIP-use-PATH-9.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 917641d6406f..c9e8ce91f0ce 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -32,7 +32,6 @@ let
     llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
-      inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
     clang-polly-unwrapped = callPackage ./clang {

From b3729ae77f5bd3f011bd8e9784b21b5824d8d91c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 28 Jan 2020 09:14:33 +0100
Subject: [PATCH 754/755] kitty: 0.15.1 -> 0.16.0

https://github.com/kovidgoyal/kitty/releases/tag/v0.16.0
---
 pkgs/applications/misc/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 6900f305c0f8..188e902614fa 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.15.1";
+  version = "0.16.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p";
+    sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
   };
 
   buildInputs = [

From e328078fe0867c432be6f14bc200f9932617783e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 28 Jan 2020 01:00:45 -0800
Subject: [PATCH 755/755] minecraft-server: 1.14.4 -> 1.15.2 (#78514)

---
 pkgs/games/minecraft-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 2fde729e935e..4751660af3ad 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation {
   pname = "minecraft-server";
-  version = "1.14.4";
+  version = "1.15.2";
 
   src = fetchurl {
-    url    = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar";
-    sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay";
+    url    = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar";
+    sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0";
   };
 
   preferLocalBuild = true;